Commit d6e25e70 authored by Wolfram Sang's avatar Wolfram Sang Committed by Greg Kroah-Hartman

staging: ks7010: indent ks_wlan.h

Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e3d74826
...@@ -56,7 +56,7 @@ struct ks_wlan_parameter { ...@@ -56,7 +56,7 @@ struct ks_wlan_parameter {
uint8_t bssid[ETH_ALEN]; /* BSSID */ uint8_t bssid[ETH_ALEN]; /* BSSID */
struct { struct {
uint8_t size; uint8_t size;
uint8_t body[32+1]; uint8_t body[32 + 1];
} ssid; /* SSID */ } ssid; /* SSID */
uint8_t preamble; /* Preamble */ uint8_t preamble; /* Preamble */
uint8_t powermgt; /* PowerManagementMode */ uint8_t powermgt; /* PowerManagementMode */
...@@ -70,10 +70,10 @@ struct ks_wlan_parameter { ...@@ -70,10 +70,10 @@ struct ks_wlan_parameter {
uint32_t wep_index; uint32_t wep_index;
struct { struct {
uint8_t size; uint8_t size;
uint8_t val[13*2+1]; uint8_t val[13 * 2 + 1];
} wep_key[4]; } wep_key[4];
uint16_t authenticate_type; uint16_t authenticate_type;
uint16_t phy_type; /* 11b/11g/11bg mode type*/ uint16_t phy_type; /* 11b/11g/11bg mode type */
uint16_t cts_mode; /* for 11g/11bg mode cts mode */ uint16_t cts_mode; /* for 11g/11bg mode cts mode */
uint16_t phy_info_timer; /* phy information timer */ uint16_t phy_info_timer; /* phy information timer */
char rom_file[256]; char rom_file[256];
...@@ -157,7 +157,6 @@ enum { ...@@ -157,7 +157,6 @@ enum {
SME_START_REQUEST, SME_START_REQUEST,
SME_GET_EEPROM_CKSUM, SME_GET_EEPROM_CKSUM,
SME_MIC_FAILURE_CONFIRM, SME_MIC_FAILURE_CONFIRM,
SME_START_CONFIRM, SME_START_CONFIRM,
...@@ -200,7 +199,7 @@ enum { ...@@ -200,7 +199,7 @@ enum {
#define SME_EVENT_BUFF_SIZE 128 #define SME_EVENT_BUFF_SIZE 128
struct sme_info{ struct sme_info {
int sme_status; int sme_status;
int event_buff[SME_EVENT_BUFF_SIZE]; int event_buff[SME_EVENT_BUFF_SIZE];
unsigned int qhead; unsigned int qhead;
...@@ -213,7 +212,7 @@ struct sme_info{ ...@@ -213,7 +212,7 @@ struct sme_info{
unsigned long sme_flag; unsigned long sme_flag;
}; };
struct hostt_t{ struct hostt_t {
int buff[SME_EVENT_BUFF_SIZE]; int buff[SME_EVENT_BUFF_SIZE];
unsigned int qhead; unsigned int qhead;
unsigned int qtail; unsigned int qtail;
...@@ -224,7 +223,7 @@ struct rsn_ie_t { ...@@ -224,7 +223,7 @@ struct rsn_ie_t {
uint8_t id; /* 0xdd = WPA or 0x30 = RSN */ uint8_t id; /* 0xdd = WPA or 0x30 = RSN */
uint8_t size; /* max ? 255 ? */ uint8_t size; /* max ? 255 ? */
uint8_t body[RSN_IE_BODY_MAX]; uint8_t body[RSN_IE_BODY_MAX];
} __attribute__((packed)); } __attribute__ ((packed));
#ifdef WPS #ifdef WPS
#define WPS_IE_BODY_MAX 255 #define WPS_IE_BODY_MAX 255
...@@ -232,7 +231,7 @@ struct wps_ie_t { ...@@ -232,7 +231,7 @@ struct wps_ie_t {
uint8_t id; /* 221 'dd <len> 00 50 F2 04' */ uint8_t id; /* 221 'dd <len> 00 50 F2 04' */
uint8_t size; /* max ? 255 ? */ uint8_t size; /* max ? 255 ? */
uint8_t body[WPS_IE_BODY_MAX]; uint8_t body[WPS_IE_BODY_MAX];
} __attribute__((packed)); } __attribute__ ((packed));
#endif /* WPS */ #endif /* WPS */
struct local_ap_t { struct local_ap_t {
...@@ -263,17 +262,17 @@ struct local_ap_t { ...@@ -263,17 +262,17 @@ struct local_ap_t {
#define LOCAL_CURRENT_AP LOCAL_APLIST_MAX #define LOCAL_CURRENT_AP LOCAL_APLIST_MAX
struct local_aplist_t { struct local_aplist_t {
int size; int size;
struct local_ap_t ap[LOCAL_APLIST_MAX+1]; struct local_ap_t ap[LOCAL_APLIST_MAX + 1];
}; };
struct local_gain_t{ struct local_gain_t {
uint8_t TxMode; uint8_t TxMode;
uint8_t RxMode; uint8_t RxMode;
uint8_t TxGain; uint8_t TxGain;
uint8_t RxGain; uint8_t RxGain;
}; };
struct local_eeprom_sum_t{ struct local_eeprom_sum_t {
uint8_t type; uint8_t type;
uint8_t result; uint8_t result;
}; };
...@@ -285,7 +284,6 @@ enum { ...@@ -285,7 +284,6 @@ enum {
EEPROM_NG, EEPROM_NG,
}; };
/* Power Save Status */ /* Power Save Status */
enum { enum {
PS_NONE, PS_NONE,
...@@ -312,7 +310,7 @@ struct sleep_status_t { ...@@ -312,7 +310,7 @@ struct sleep_status_t {
/* WPA */ /* WPA */
struct scan_ext_t { struct scan_ext_t {
unsigned int flag; unsigned int flag;
char ssid[IW_ESSID_MAX_SIZE+1]; char ssid[IW_ESSID_MAX_SIZE + 1];
}; };
enum { enum {
...@@ -447,7 +445,7 @@ struct ks_wlan_private { ...@@ -447,7 +445,7 @@ struct ks_wlan_private {
struct ks_wlan_parameter reg; struct ks_wlan_parameter reg;
uint8_t current_rate; uint8_t current_rate;
char nick[IW_ESSID_MAX_SIZE+1]; char nick[IW_ESSID_MAX_SIZE + 1];
spinlock_t multicast_spin; spinlock_t multicast_spin;
...@@ -466,7 +464,7 @@ struct ks_wlan_private { ...@@ -466,7 +464,7 @@ struct ks_wlan_private {
int dev_size[DEVICE_STOCK_COUNT]; int dev_size[DEVICE_STOCK_COUNT];
/* ioctl : IOCTL_FIRMWARE_VERSION */ /* ioctl : IOCTL_FIRMWARE_VERSION */
unsigned char firmware_version[128+1]; unsigned char firmware_version[128 + 1];
int version_size; int version_size;
int mac_address_valid; /* Mac Address Status */ int mac_address_valid; /* Mac Address Status */
...@@ -484,7 +482,7 @@ struct ks_wlan_private { ...@@ -484,7 +482,7 @@ struct ks_wlan_private {
uint8_t data_buff[0x1000]; uint8_t data_buff[0x1000];
uint8_t scan_ssid_len; uint8_t scan_ssid_len;
uint8_t scan_ssid[IW_ESSID_MAX_SIZE+1]; uint8_t scan_ssid[IW_ESSID_MAX_SIZE + 1];
struct local_gain_t gain; struct local_gain_t gain;
#ifdef WPS #ifdef WPS
struct net_device *l2_dev; struct net_device *l2_dev;
...@@ -507,6 +505,4 @@ struct ks_wlan_private { ...@@ -507,6 +505,4 @@ struct ks_wlan_private {
}; };
#endif /* _KS_WLAN_H */ #endif /* _KS_WLAN_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment