Commit cf3a9579 authored by Christian Lamparter's avatar Christian Lamparter Committed by John W. Linville
Browse files

p54: clean up p54.h's struct p54_common 



This patch rearrange and regroups most elements in p54_common.

Signed-off-by: default avatarChristian Lamparter <chunkeey@web.de>
Acked-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent ae3d2462

drivers/net/wireless/p54/p54.h

+42 −25
Original line number Diff line number Diff line
@@ -133,55 +133,72 @@ struct p54_led_dev { 


struct p54_common {

	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);

	int (*open)(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;

	u8 headroom;

	u8 tailroom;

	struct mutex conf_mutex;

	u8 mac_addr[ETH_ALEN];

	u8 bssid[ETH_ALEN];



	/* firmware/hardware info */

	unsigned int tx_hdr_len;

	unsigned int fw_var;

	unsigned int fw_interface;

	u8 version;



	/* (e)DCF / QOS state */

	bool use_short_slot;

	struct ieee80211_tx_queue_stats tx_stats[8];

	struct p54_edcf_queue_param qos_params[8];



	/* Radio data */

	u16 rxhw;

	u8 rx_diversity_mask;

	u8 tx_diversity_mask;

	unsigned int output_power;

	int noise;

	/* calibration, output power limit and rssi<->dBm conversation data */

	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_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;

	bool use_short_slot;

	u16 rxhw;

	u8 version;

	unsigned int tx_hdr_len;

	unsigned int fw_var;

	unsigned int fw_interface;

	unsigned int output_power;

	u32 tsf_low32;

	u32 tsf_high32;

	int mode;

	u32 tsf_low32, tsf_high32;

	u32 basic_rate_mask;

	u16 wakeup_timer;

	u16 aid;

	struct ieee80211_tx_queue_stats tx_stats[8];

	struct p54_edcf_queue_param qos_params[8];

	struct ieee80211_low_level_stats stats;

	struct delayed_work work;

	struct sk_buff *cached_beacon;

	int noise;

	void *eeprom;

	struct completion eeprom_comp;



	/* cryptographic engine information */

	u8 privacy_caps;

	u8 rx_keycache_size;



	/* LED management */

#ifdef CONFIG_P54_LEDS

	struct p54_led_dev assoc_led;

	struct p54_led_dev tx_led;

#endif /* CONFIG_P54_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);