Commit 51e9bf5d authored by Harvey Harrison's avatar Harvey Harrison Committed by John W. Linville
Browse files

iwlwifi: remove uses of __constant_{endian} helpers 



The base versions handle constant folding just fine.

Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 10ec4f1d

drivers/net/wireless/iwlwifi/iwl-3945-commands.h

+67 −67
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ struct iwl3945_power_per_rate { 
 *

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



#define UCODE_VALID_OK	__constant_cpu_to_le32(0x1)

#define UCODE_VALID_OK	cpu_to_le32(0x1)

#define INITIALIZE_SUBTYPE    (9)



/*
@@ -322,42 +322,42 @@ enum { 


/* rx_config flags */

/* band & modulation selection */

#define RXON_FLG_BAND_24G_MSK           __constant_cpu_to_le32(1 << 0)

#define RXON_FLG_CCK_MSK                __constant_cpu_to_le32(1 << 1)

#define RXON_FLG_BAND_24G_MSK           cpu_to_le32(1 << 0)

#define RXON_FLG_CCK_MSK                cpu_to_le32(1 << 1)

/* auto detection enable */

#define RXON_FLG_AUTO_DETECT_MSK        __constant_cpu_to_le32(1 << 2)

#define RXON_FLG_AUTO_DETECT_MSK        cpu_to_le32(1 << 2)

/* TGg protection when tx */

#define RXON_FLG_TGG_PROTECT_MSK        __constant_cpu_to_le32(1 << 3)

#define RXON_FLG_TGG_PROTECT_MSK        cpu_to_le32(1 << 3)

/* cck short slot & preamble */

#define RXON_FLG_SHORT_SLOT_MSK          __constant_cpu_to_le32(1 << 4)

#define RXON_FLG_SHORT_PREAMBLE_MSK     __constant_cpu_to_le32(1 << 5)

#define RXON_FLG_SHORT_SLOT_MSK          cpu_to_le32(1 << 4)

#define RXON_FLG_SHORT_PREAMBLE_MSK     cpu_to_le32(1 << 5)

/* antenna selection */

#define RXON_FLG_DIS_DIV_MSK            __constant_cpu_to_le32(1 << 7)

#define RXON_FLG_ANT_SEL_MSK            __constant_cpu_to_le32(0x0f00)

#define RXON_FLG_ANT_A_MSK              __constant_cpu_to_le32(1 << 8)

#define RXON_FLG_ANT_B_MSK              __constant_cpu_to_le32(1 << 9)

#define RXON_FLG_DIS_DIV_MSK            cpu_to_le32(1 << 7)

#define RXON_FLG_ANT_SEL_MSK            cpu_to_le32(0x0f00)

#define RXON_FLG_ANT_A_MSK              cpu_to_le32(1 << 8)

#define RXON_FLG_ANT_B_MSK              cpu_to_le32(1 << 9)

/* radar detection enable */

#define RXON_FLG_RADAR_DETECT_MSK       __constant_cpu_to_le32(1 << 12)

#define RXON_FLG_TGJ_NARROW_BAND_MSK    __constant_cpu_to_le32(1 << 13)

#define RXON_FLG_RADAR_DETECT_MSK       cpu_to_le32(1 << 12)

#define RXON_FLG_TGJ_NARROW_BAND_MSK    cpu_to_le32(1 << 13)

/* rx response to host with 8-byte TSF

* (according to ON_AIR deassertion) */

#define RXON_FLG_TSF2HOST_MSK           __constant_cpu_to_le32(1 << 15)

#define RXON_FLG_TSF2HOST_MSK           cpu_to_le32(1 << 15)



/* rx_config filter flags */

/* accept all data frames */

#define RXON_FILTER_PROMISC_MSK         __constant_cpu_to_le32(1 << 0)

#define RXON_FILTER_PROMISC_MSK         cpu_to_le32(1 << 0)

/* pass control & management to host */

#define RXON_FILTER_CTL2HOST_MSK        __constant_cpu_to_le32(1 << 1)

#define RXON_FILTER_CTL2HOST_MSK        cpu_to_le32(1 << 1)

/* accept multi-cast */

#define RXON_FILTER_ACCEPT_GRP_MSK      __constant_cpu_to_le32(1 << 2)

#define RXON_FILTER_ACCEPT_GRP_MSK      cpu_to_le32(1 << 2)

/* don't decrypt uni-cast frames */

#define RXON_FILTER_DIS_DECRYPT_MSK     __constant_cpu_to_le32(1 << 3)

#define RXON_FILTER_DIS_DECRYPT_MSK     cpu_to_le32(1 << 3)

/* don't decrypt multi-cast frames */

#define RXON_FILTER_DIS_GRP_DECRYPT_MSK __constant_cpu_to_le32(1 << 4)

#define RXON_FILTER_DIS_GRP_DECRYPT_MSK cpu_to_le32(1 << 4)

/* STA is associated */

#define RXON_FILTER_ASSOC_MSK           __constant_cpu_to_le32(1 << 5)

#define RXON_FILTER_ASSOC_MSK           cpu_to_le32(1 << 5)

/* transfer to host non bssid beacons in associated state */

#define RXON_FILTER_BCON_AWARE_MSK      __constant_cpu_to_le32(1 << 6)

#define RXON_FILTER_BCON_AWARE_MSK      cpu_to_le32(1 << 6)



/**

 * REPLY_RXON = 0x10 (command, has simple generic response)
@@ -471,9 +471,9 @@ struct iwl3945_ac_qos { 
} __attribute__ ((packed));



/* QoS flags defines */

#define QOS_PARAM_FLG_UPDATE_EDCA_MSK	__constant_cpu_to_le32(0x01)

#define QOS_PARAM_FLG_TGN_MSK		__constant_cpu_to_le32(0x02)

#define QOS_PARAM_FLG_TXOP_TYPE_MSK	__constant_cpu_to_le32(0x10)

#define QOS_PARAM_FLG_UPDATE_EDCA_MSK	cpu_to_le32(0x01)

#define QOS_PARAM_FLG_TGN_MSK		cpu_to_le32(0x02)

#define QOS_PARAM_FLG_TXOP_TYPE_MSK	cpu_to_le32(0x10)



/* Number of Access Categories (AC) (EDCA), queues 0..3 */

#define AC_NUM                4
@@ -508,27 +508,27 @@ struct iwl3945_qosparam_cmd { 
#define	IWL_STATION_COUNT	32 	/* MAX(3945,4965)*/

#define	IWL_INVALID_STATION 	255



#define STA_FLG_TX_RATE_MSK		__constant_cpu_to_le32(1 << 2);

#define STA_FLG_PWR_SAVE_MSK		__constant_cpu_to_le32(1 << 8);

#define STA_FLG_TX_RATE_MSK		cpu_to_le32(1 << 2);

#define STA_FLG_PWR_SAVE_MSK		cpu_to_le32(1 << 8);



/* Use in mode field.  1: modify existing entry, 0: add new station entry */

#define STA_CONTROL_MODIFY_MSK		0x01



/* key flags __le16*/

#define STA_KEY_FLG_ENCRYPT_MSK	__constant_cpu_to_le16(0x0007)

#define STA_KEY_FLG_NO_ENC	__constant_cpu_to_le16(0x0000)

#define STA_KEY_FLG_WEP		__constant_cpu_to_le16(0x0001)

#define STA_KEY_FLG_CCMP	__constant_cpu_to_le16(0x0002)

#define STA_KEY_FLG_TKIP	__constant_cpu_to_le16(0x0003)

#define STA_KEY_FLG_ENCRYPT_MSK	cpu_to_le16(0x0007)

#define STA_KEY_FLG_NO_ENC	cpu_to_le16(0x0000)

#define STA_KEY_FLG_WEP		cpu_to_le16(0x0001)

#define STA_KEY_FLG_CCMP	cpu_to_le16(0x0002)

#define STA_KEY_FLG_TKIP	cpu_to_le16(0x0003)



#define STA_KEY_FLG_KEYID_POS	8

#define STA_KEY_FLG_INVALID 	__constant_cpu_to_le16(0x0800)

#define STA_KEY_FLG_INVALID 	cpu_to_le16(0x0800)

/* wep key is either from global key (0) or from station info array (1) */

#define STA_KEY_FLG_WEP_KEY_MAP_MSK  __constant_cpu_to_le16(0x0008)

#define STA_KEY_FLG_WEP_KEY_MAP_MSK  cpu_to_le16(0x0008)



/* wep key in STA: 5-bytes (0) or 13-bytes (1) */

#define STA_KEY_FLG_KEY_SIZE_MSK     __constant_cpu_to_le16(0x1000)

#define STA_KEY_MULTICAST_MSK        __constant_cpu_to_le16(0x4000)

#define STA_KEY_FLG_KEY_SIZE_MSK     cpu_to_le16(0x1000)

#define STA_KEY_MULTICAST_MSK        cpu_to_le16(0x4000)



/* Flags indicate whether to modify vs. don't change various station params */

#define	STA_MODIFY_KEY_MASK		0x01
@@ -666,14 +666,14 @@ struct iwl3945_rx_frame_hdr { 
	u8 payload[0];

} __attribute__ ((packed));



#define RX_RES_STATUS_NO_CRC32_ERROR	__constant_cpu_to_le32(1 << 0)

#define RX_RES_STATUS_NO_RXE_OVERFLOW	__constant_cpu_to_le32(1 << 1)

#define RX_RES_STATUS_NO_CRC32_ERROR	cpu_to_le32(1 << 0)

#define RX_RES_STATUS_NO_RXE_OVERFLOW	cpu_to_le32(1 << 1)



#define RX_RES_PHY_FLAGS_BAND_24_MSK	__constant_cpu_to_le16(1 << 0)

#define RX_RES_PHY_FLAGS_MOD_CCK_MSK		__constant_cpu_to_le16(1 << 1)

#define RX_RES_PHY_FLAGS_SHORT_PREAMBLE_MSK	__constant_cpu_to_le16(1 << 2)

#define RX_RES_PHY_FLAGS_NARROW_BAND_MSK	__constant_cpu_to_le16(1 << 3)

#define RX_RES_PHY_FLAGS_ANTENNA_MSK		__constant_cpu_to_le16(0xf0)

#define RX_RES_PHY_FLAGS_BAND_24_MSK	cpu_to_le16(1 << 0)

#define RX_RES_PHY_FLAGS_MOD_CCK_MSK		cpu_to_le16(1 << 1)

#define RX_RES_PHY_FLAGS_SHORT_PREAMBLE_MSK	cpu_to_le16(1 << 2)

#define RX_RES_PHY_FLAGS_NARROW_BAND_MSK	cpu_to_le16(1 << 3)

#define RX_RES_PHY_FLAGS_ANTENNA_MSK		cpu_to_le16(0xf0)



#define RX_RES_STATUS_SEC_TYPE_MSK	(0x7 << 8)

#define RX_RES_STATUS_SEC_TYPE_NONE	(0x0 << 8)
@@ -733,57 +733,57 @@ struct iwl3945_rx_frame { 


/* 1: Use Request-To-Send protocol before this frame.

 * Mutually exclusive vs. TX_CMD_FLG_CTS_MSK. */

#define TX_CMD_FLG_RTS_MSK __constant_cpu_to_le32(1 << 1)

#define TX_CMD_FLG_RTS_MSK cpu_to_le32(1 << 1)



/* 1: Transmit Clear-To-Send to self before this frame.

 * Driver should set this for AUTH/DEAUTH/ASSOC-REQ/REASSOC mgmnt frames.

 * Mutually exclusive vs. TX_CMD_FLG_RTS_MSK. */

#define TX_CMD_FLG_CTS_MSK __constant_cpu_to_le32(1 << 2)

#define TX_CMD_FLG_CTS_MSK cpu_to_le32(1 << 2)



/* 1: Expect ACK from receiving station

 * 0: Don't expect ACK (MAC header's duration field s/b 0)

 * Set this for unicast frames, but not broadcast/multicast. */

#define TX_CMD_FLG_ACK_MSK __constant_cpu_to_le32(1 << 3)

#define TX_CMD_FLG_ACK_MSK cpu_to_le32(1 << 3)



/* 1: Use rate scale table (see REPLY_TX_LINK_QUALITY_CMD).

 *    Tx command's initial_rate_index indicates first rate to try;

 *    uCode walks through table for additional Tx attempts.

 * 0: Use Tx rate/MCS from Tx command's rate_n_flags field.

 *    This rate will be used for all Tx attempts; it will not be scaled. */

#define TX_CMD_FLG_STA_RATE_MSK __constant_cpu_to_le32(1 << 4)

#define TX_CMD_FLG_STA_RATE_MSK cpu_to_le32(1 << 4)



/* 1: Expect immediate block-ack.

 * Set when Txing a block-ack request frame.  Also set TX_CMD_FLG_ACK_MSK. */

#define TX_CMD_FLG_IMM_BA_RSP_MASK  __constant_cpu_to_le32(1 << 6)

#define TX_CMD_FLG_IMM_BA_RSP_MASK  cpu_to_le32(1 << 6)



/* 1: Frame requires full Tx-Op protection.

 * Set this if either RTS or CTS Tx Flag gets set. */

#define TX_CMD_FLG_FULL_TXOP_PROT_MSK __constant_cpu_to_le32(1 << 7)

#define TX_CMD_FLG_FULL_TXOP_PROT_MSK cpu_to_le32(1 << 7)



/* Tx antenna selection field; used only for 3945, reserved (0) for 4965.

 * Set field to "0" to allow 3945 uCode to select antenna (normal usage). */

#define TX_CMD_FLG_ANT_SEL_MSK __constant_cpu_to_le32(0xf00)

#define TX_CMD_FLG_ANT_A_MSK __constant_cpu_to_le32(1 << 8)

#define TX_CMD_FLG_ANT_B_MSK __constant_cpu_to_le32(1 << 9)

#define TX_CMD_FLG_ANT_SEL_MSK cpu_to_le32(0xf00)

#define TX_CMD_FLG_ANT_A_MSK cpu_to_le32(1 << 8)

#define TX_CMD_FLG_ANT_B_MSK cpu_to_le32(1 << 9)



/* 1: Ignore Bluetooth priority for this frame.

 * 0: Delay Tx until Bluetooth device is done (normal usage). */

#define TX_CMD_FLG_BT_DIS_MSK __constant_cpu_to_le32(1 << 12)

#define TX_CMD_FLG_BT_DIS_MSK cpu_to_le32(1 << 12)



/* 1: uCode overrides sequence control field in MAC header.

 * 0: Driver provides sequence control field in MAC header.

 * Set this for management frames, non-QOS data frames, non-unicast frames,

 * and also in Tx command embedded in REPLY_SCAN_CMD for active scans. */

#define TX_CMD_FLG_SEQ_CTL_MSK __constant_cpu_to_le32(1 << 13)

#define TX_CMD_FLG_SEQ_CTL_MSK cpu_to_le32(1 << 13)



/* 1: This frame is non-last MPDU; more fragments are coming.

 * 0: Last fragment, or not using fragmentation. */

#define TX_CMD_FLG_MORE_FRAG_MSK __constant_cpu_to_le32(1 << 14)

#define TX_CMD_FLG_MORE_FRAG_MSK cpu_to_le32(1 << 14)



/* 1: uCode calculates and inserts Timestamp Function (TSF) in outgoing frame.

 * 0: No TSF required in outgoing frame.

 * Set this for transmitting beacons and probe responses. */

#define TX_CMD_FLG_TSF_MSK __constant_cpu_to_le32(1 << 16)

#define TX_CMD_FLG_TSF_MSK cpu_to_le32(1 << 16)



/* 1: Driver inserted 2 bytes pad after the MAC header, for (required) dword

 *    alignment of frame's payload data field.
@@ -791,10 +791,10 @@ struct iwl3945_rx_frame { 
 * Set this for MAC headers with 26 or 30 bytes, i.e. those with QOS or ADDR4

 * field (but not both).  Driver must align frame data (i.e. data following

 * MAC header) to DWORD boundary. */

#define TX_CMD_FLG_MH_PAD_MSK __constant_cpu_to_le32(1 << 20)

#define TX_CMD_FLG_MH_PAD_MSK cpu_to_le32(1 << 20)



/* HCCA-AP - disable duration overwriting. */

#define TX_CMD_FLG_DUR_MSK __constant_cpu_to_le32(1 << 25)

#define TX_CMD_FLG_DUR_MSK cpu_to_le32(1 << 25)



/*

 * TX command security control
@@ -1158,9 +1158,9 @@ struct iwl3945_spectrum_notification { 
 */

#define IWL_POWER_VEC_SIZE 5



#define IWL_POWER_DRIVER_ALLOW_SLEEP_MSK	__constant_cpu_to_le32(1 << 0)

#define IWL_POWER_SLEEP_OVER_DTIM_MSK		__constant_cpu_to_le32(1 << 2)

#define IWL_POWER_PCI_PM_MSK			__constant_cpu_to_le32(1 << 3)

#define IWL_POWER_DRIVER_ALLOW_SLEEP_MSK	cpu_to_le32(1 << 0)

#define IWL_POWER_SLEEP_OVER_DTIM_MSK		cpu_to_le32(1 << 2)

#define IWL_POWER_PCI_PM_MSK			cpu_to_le32(1 << 3)

struct iwl3945_powertable_cmd {

	__le32 flags;

	__le32 rx_data_timeout;
@@ -1278,8 +1278,8 @@ struct iwl3945_ssid_ie { 
} __attribute__ ((packed));



#define PROBE_OPTION_MAX        0x4

#define TX_CMD_LIFE_TIME_INFINITE	__constant_cpu_to_le32(0xFFFFFFFF)

#define IWL_GOOD_CRC_TH		__constant_cpu_to_le16(1)

#define TX_CMD_LIFE_TIME_INFINITE	cpu_to_le32(0xFFFFFFFF)

#define IWL_GOOD_CRC_TH		cpu_to_le16(1)

#define IWL_MAX_SCAN_SIZE 1024



/*
@@ -1379,7 +1379,7 @@ struct iwl3945_scan_cmd { 
} __attribute__ ((packed));



/* Can abort will notify by complete notification with abort status. */

#define CAN_ABORT_STATUS	__constant_cpu_to_le32(0x1)

#define CAN_ABORT_STATUS	cpu_to_le32(0x1)

/* complete notification statuses */

#define ABORT_STATUS            0x2
@@ -1572,8 +1572,8 @@ struct statistics_general { 
 * STATISTICS_NOTIFICATIONs after received beacons (see below).  This flag

 * does not affect the response to the REPLY_STATISTICS_CMD 0x9c itself.

 */

#define IWL_STATS_CONF_CLEAR_STATS __constant_cpu_to_le32(0x1)	/* see above */

#define IWL_STATS_CONF_DISABLE_NOTIF __constant_cpu_to_le32(0x2)/* see above */

#define IWL_STATS_CONF_CLEAR_STATS cpu_to_le32(0x1)	/* see above */

#define IWL_STATS_CONF_DISABLE_NOTIF cpu_to_le32(0x2)/* see above */

struct iwl3945_statistics_cmd {

	__le32 configuration_flags;	/* IWL_STATS_CONF_* */

} __attribute__ ((packed));
@@ -1593,8 +1593,8 @@ struct iwl3945_statistics_cmd { 
 * appropriately so that each notification contains statistics for only the

 * one channel that has just been scanned.

 */

#define STATISTICS_REPLY_FLG_BAND_24G_MSK         __constant_cpu_to_le32(0x2)

#define STATISTICS_REPLY_FLG_FAT_MODE_MSK         __constant_cpu_to_le32(0x8)

#define STATISTICS_REPLY_FLG_BAND_24G_MSK         cpu_to_le32(0x2)

#define STATISTICS_REPLY_FLG_FAT_MODE_MSK         cpu_to_le32(0x8)

struct iwl3945_notif_statistics {

	__le32 flag;

	struct statistics_rx rx;

drivers/net/wireless/iwlwifi/iwl-commands.h

+96 −96

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE