Commit ee8e365a authored by James Ketrenos's avatar James Ketrenos
Browse files

Ran scripts/Lindent on drivers/net/wireless/ipw2{1,2}00.{c,h} 



No other changes.

Signed-off-by: default avatarJames Ketrenos <jketreno@linux.intel.com>
parent d7e02edb

drivers/net/wireless/ipw2100.c

+1085 −1132

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/wireless/ipw2100.h

+70 −86
Original line number Diff line number Diff line
@@ -93,7 +93,6 @@ struct ipw2100_rx_packet; 
#define IPW_DL_IOCTL         (1<<14)

#define IPW_DL_RF_KILL       (1<<17)





#define IPW_DL_MANAGE        (1<<15)

#define IPW_DL_FW            (1<<16)
@@ -156,7 +155,9 @@ extern const char *band_str[]; 


struct bd_status {

	union {

		struct { u8 nlf:1, txType:2, intEnabled:1, reserved:4;} fields;

		struct {

			u8 nlf:1, txType:2, intEnabled:1, reserved:4;

		} fields;

		u8 field;

	} info;

} __attribute__ ((packed));
@@ -313,7 +314,6 @@ struct host_command { 
	u32 host_command_parameters[HOST_COMMAND_PARAMS_REG_LEN];	// COMMAND PARAMETERS

} __attribute__ ((packed));





typedef enum {

	POWER_ON_RESET,

	EXIT_POWER_DOWN_RESET,
@@ -328,7 +328,6 @@ enum { 
	RX

};





struct ipw2100_tx_packet {

	int type;

	int index;
@@ -348,7 +347,6 @@ struct ipw2100_tx_packet { 
	struct list_head list;

};





struct ipw2100_rx_packet {

	struct ipw2100_rx *rxp;

	dma_addr_t dma_addr;
@@ -453,8 +451,6 @@ enum { 
#define STATUS_RESET_PENDING    (1<<29)

#define STATUS_SECURITY_UPDATED (1<<30)	/* Security sync needed */







/* Internal NIC states */

#define IPW_STATE_INITIALIZED	(1<<0)

#define IPW_STATE_COUNTRY_FOUND	(1<<1)
@@ -469,8 +465,6 @@ enum { 
#define IPW_STATE_POWER_DOWN	(1<<10)

#define IPW_STATE_SCANNING      (1<<11)







#define CFG_STATIC_CHANNEL      (1<<0)	/* Restrict assoc. to single channel */

#define CFG_STATIC_ESSID        (1<<1)	/* Restrict assoc. to single SSID */

#define CFG_STATIC_BSSID        (1<<2)	/* Restrict assoc. to single BSSID */
@@ -531,7 +525,6 @@ struct ipw2100_priv { 
	struct ieee80211_security sec;

	int messages_sent;





	int short_retry_limit;

	int long_retry_limit;
@@ -599,7 +592,6 @@ struct ipw2100_priv { 
	wait_queue_head_t wait_command_queue;

};





/*********************************************************

 * Host Command -> From Driver to FW

 *********************************************************/
@@ -646,7 +638,6 @@ struct ipw2100_priv { 
#define CARD_DISABLE_PHY_OFF   61

#define MSDU_TX_RATES          62





/* Rogue AP Detection */

#define SET_STATION_STAT_BITS      64

#define CLEAR_STATIONS_STAT_BITS   65
@@ -655,8 +646,6 @@ struct ipw2100_priv { 
#define DISASSOCIATION_BSSID	   68

#define SET_WPA_IE                 69







/* system configuration bit mask: */

#define IPW_CFG_MONITOR               0x00004

#define IPW_CFG_PREAMBLE_AUTO        0x00010
@@ -784,9 +773,6 @@ struct ipw2100_priv { 
#define IPW_CARD_DISABLE_PHY_OFF_COMPLETE_WAIT	    100	// 100 milli

#define IPW_PREPARE_POWER_DOWN_COMPLETE_WAIT	    100	// 100 milli









#define IPW_HEADER_802_11_SIZE		 sizeof(struct ieee80211_hdr_3addr)

#define IPW_MAX_80211_PAYLOAD_SIZE              2304U

#define IPW_MAX_802_11_PAYLOAD_LENGTH		2312
@@ -856,7 +842,6 @@ struct ipw2100_rx { 
#define DIVERSITY_ANTENNA_A         1	// Use antenna A

#define DIVERSITY_ANTENNA_B         2	// Use antenna B





#define HOST_COMMAND_WAIT 0

#define HOST_COMMAND_NO_WAIT 1
@@ -873,7 +858,6 @@ struct ipw2100_rx { 
#define TYPE_ASSOCIATION_REQUEST	0x0013

#define TYPE_REASSOCIATION_REQUEST	0x0014





#define HW_FEATURE_RFKILL (0x0001)

#define RF_KILLSWITCH_OFF (1)

#define RF_KILLSWITCH_ON  (0)