lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

p54: clean up p54.h's struct p54_common

Browse Source 
This patch rearrange and regroups most elements in p54_common.

Signed-off-by: Christian Lamparter <chunkeey@web.de>
Acked-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Christian Lamparter
2009-03-25 03:11:58 +01:00
committed by John W. Linville
parent ae3d2462f8
commit cf3a9579f6
1 changed files with 46 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
drivers/net/wireless/p54/p54.h
View File

@@ -133,55 +133,72 @@ struct p54_led_dev {
struct p54_common { struct p54_common {
struct ieee80211_hw *hw; struct ieee80211_hw *hw;
u32 rx_start;
u32 rx_end;
struct sk_buff_head tx_queue;
void (*tx)(struct ieee80211_hw *dev, struct sk_buff *skb); void (*tx)(struct ieee80211_hw *dev, struct sk_buff *skb);
int (*open)(struct ieee80211_hw *dev); int (*open)(struct ieee80211_hw *dev);
void (*stop)(struct ieee80211_hw *dev); void (*stop)(struct ieee80211_hw *dev);
int mode; struct sk_buff_head tx_queue;
struct mutex conf_mutex;
/* memory management (as seen by the firmware) */
u32 rx_start;
u32 rx_end;
u16 rx_mtu; u16 rx_mtu;
u8 headroom; u8 headroom;
u8 tailroom; u8 tailroom;
struct mutex conf_mutex;
u8 mac_addr[ETH_ALEN]; /* firmware/hardware info */
u8 bssid[ETH_ALEN];
u8 rx_diversity_mask;
u8 tx_diversity_mask;
struct pda_iq_autocal_entry *iq_autocal;
unsigned int iq_autocal_len;
struct p54_cal_database *output_limit;
struct p54_cal_database *curve_data;
struct p54_rssi_linear_approximation rssical_db[IEEE80211_NUM_BANDS];
unsigned int filter_flags;
bool use_short_slot;
u16 rxhw;
u8 version;
unsigned int tx_hdr_len; unsigned int tx_hdr_len;
unsigned int fw_var; unsigned int fw_var;
unsigned int fw_interface; unsigned int fw_interface;
unsigned int output_power; u8 version;
u32 tsf_low32;
u32 tsf_high32; /* (e)DCF / QOS state */
u32 basic_rate_mask; bool use_short_slot;
u16 wakeup_timer;
u16 aid;
struct ieee80211_tx_queue_stats tx_stats[8]; struct ieee80211_tx_queue_stats tx_stats[8];
struct p54_edcf_queue_param qos_params[8]; struct p54_edcf_queue_param qos_params[8];
struct ieee80211_low_level_stats stats;
struct delayed_work work; /* Radio data */
struct sk_buff *cached_beacon; u16 rxhw;
u8 rx_diversity_mask;
u8 tx_diversity_mask;
unsigned int output_power;
int noise; int noise;
void *eeprom; /* calibration, output power limit and rssi<->dBm conversation data */
struct completion eeprom_comp; struct pda_iq_autocal_entry *iq_autocal;
unsigned int iq_autocal_len;
struct p54_cal_database *curve_data;
struct p54_cal_database *output_limit;
struct p54_rssi_linear_approximation rssical_db[IEEE80211_NUM_BANDS];
/* BBP/MAC state */
u8 mac_addr[ETH_ALEN];
u8 bssid[ETH_ALEN];
u16 wakeup_timer;
unsigned int filter_flags;
int mode;
u32 tsf_low32, tsf_high32;
u32 basic_rate_mask;
u16 aid;
struct sk_buff *cached_beacon;
/* cryptographic engine information */
u8 privacy_caps; u8 privacy_caps;
u8 rx_keycache_size; u8 rx_keycache_size;
/* LED management */ /* LED management */
#ifdef CONFIG_P54_LEDS #ifdef CONFIG_P54_LEDS
struct p54_led_dev assoc_led; struct p54_led_dev assoc_led;
struct p54_led_dev tx_led; struct p54_led_dev tx_led;
#endif /* CONFIG_P54_LEDS */ #endif /* CONFIG_P54_LEDS */
u16 softled_state; /* bit field of glowing LEDs */ u16 softled_state; /* bit field of glowing LEDs */
/* statistics */
struct ieee80211_low_level_stats stats;
struct delayed_work work;
/* eeprom handling */
void *eeprom;
struct completion eeprom_comp;
}; };
int p54_rx(struct ieee80211_hw *dev, struct sk_buff *skb); int p54_rx(struct ieee80211_hw *dev, struct sk_buff *skb);