AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-01 14:26:46 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

iwlwifi: fix some warnings

Browse Source 
This fixes all kinds of warnings in iwlwifi.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Johannes Berg 2008-04-01 17:51:47 +02:00 committed by John W. Linville
parent 16788599a9
commit a0b484fee7
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/wireless/iwlwifi/iwl-3945.c
View File

@ -524,7 +524,7 @@ static void iwl3945_add_radiotap(struct iwl3945_priv *priv,
s8 noise = 0; s8 noise = 0;
int rate = stats->rate_idx; int rate = stats->rate_idx;
u64 tsf = stats->mactime; u64 tsf = stats->mactime;
__le16 phy_flags_hw = rx_hdr->phy_flags; __le16 phy_flags_hw = rx_hdr->phy_flags, antenna;
struct iwl3945_rt_rx_hdr { struct iwl3945_rt_rx_hdr {
struct ieee80211_radiotap_header rt_hdr; struct ieee80211_radiotap_header rt_hdr;
@ -596,8 +596,8 @@ static void iwl3945_add_radiotap(struct iwl3945_priv *priv,
iwl3945_rt->rt_rate = iwl3945_rates[rate].ieee; iwl3945_rt->rt_rate = iwl3945_rates[rate].ieee;
/* antenna number */ /* antenna number */
iwl3945_rt->rt_antenna = antenna = phy_flags_hw & RX_RES_PHY_FLAGS_ANTENNA_MSK;
le16_to_cpu(phy_flags_hw & RX_RES_PHY_FLAGS_ANTENNA_MSK) >> 4; iwl3945_rt->rt_antenna = le16_to_cpu(antenna) >> 4;
/* set the preamble flag if we have it */ /* set the preamble flag if we have it */
if (phy_flags_hw & RX_RES_PHY_FLAGS_SHORT_PREAMBLE_MSK) if (phy_flags_hw & RX_RES_PHY_FLAGS_SHORT_PREAMBLE_MSK)

4
drivers/net/wireless/iwlwifi/iwl-3945.h
View File

@ -280,8 +280,8 @@ struct iwl3945_frame {
#define SEQ_TO_QUEUE(x) ((x >> 8) & 0xbf) #define SEQ_TO_QUEUE(x) ((x >> 8) & 0xbf)
#define QUEUE_TO_SEQ(x) ((x & 0xbf) << 8) #define QUEUE_TO_SEQ(x) ((x & 0xbf) << 8)
#define SEQ_TO_INDEX(x) (x & 0xff) #define SEQ_TO_INDEX(x) ((u8)(x & 0xff))
#define INDEX_TO_SEQ(x) (x & 0xff) #define INDEX_TO_SEQ(x) ((u8)(x & 0xff))
#define SEQ_HUGE_FRAME (0x4000) #define SEQ_HUGE_FRAME (0x4000)
#define SEQ_RX_FRAME __constant_cpu_to_le16(0x8000) #define SEQ_RX_FRAME __constant_cpu_to_le16(0x8000)
#define SEQ_TO_SN(seq) (((seq) & IEEE80211_SCTL_SEQ) >> 4) #define SEQ_TO_SN(seq) (((seq) & IEEE80211_SCTL_SEQ) >> 4)

5
drivers/net/wireless/iwlwifi/iwl-4965.c
View File

@ -3296,6 +3296,7 @@ static void iwl4965_add_radiotap(struct iwl_priv *priv,
s8 noise = 0; s8 noise = 0;
int rate = stats->rate_idx; int rate = stats->rate_idx;
u64 tsf = stats->mactime; u64 tsf = stats->mactime;
__le16 antenna;
__le16 phy_flags_hw = rx_start->phy_flags; __le16 phy_flags_hw = rx_start->phy_flags;
struct iwl4965_rt_rx_hdr { struct iwl4965_rt_rx_hdr {
struct ieee80211_radiotap_header rt_hdr; struct ieee80211_radiotap_header rt_hdr;
@ -3380,8 +3381,8 @@ static void iwl4965_add_radiotap(struct iwl_priv *priv,
* new 802.11n radiotap field "RX chains" that is defined * new 802.11n radiotap field "RX chains" that is defined
* as a bitmask. * as a bitmask.
*/ */
iwl4965_rt->rt_antenna = antenna = phy_flags_hw & RX_RES_PHY_FLAGS_ANTENNA_MSK;
le16_to_cpu(phy_flags_hw & RX_RES_PHY_FLAGS_ANTENNA_MSK) >> 4; iwl4965_rt->rt_antenna = le16_to_cpu(antenna) >> 4;
/* set the preamble flag if appropriate */ /* set the preamble flag if appropriate */
if (phy_flags_hw & RX_RES_PHY_FLAGS_SHORT_PREAMBLE_MSK) if (phy_flags_hw & RX_RES_PHY_FLAGS_SHORT_PREAMBLE_MSK)

4
drivers/net/wireless/iwlwifi/iwl-4965.h
View File

@ -294,8 +294,8 @@ struct iwl4965_frame {
#define SEQ_TO_QUEUE(x) ((x >> 8) & 0xbf) #define SEQ_TO_QUEUE(x) ((x >> 8) & 0xbf)
#define QUEUE_TO_SEQ(x) ((x & 0xbf) << 8) #define QUEUE_TO_SEQ(x) ((x & 0xbf) << 8)
#define SEQ_TO_INDEX(x) (x & 0xff) #define SEQ_TO_INDEX(x) ((u8)(x & 0xff))
#define INDEX_TO_SEQ(x) (x & 0xff) #define INDEX_TO_SEQ(x) ((u8)(x & 0xff))
#define SEQ_HUGE_FRAME (0x4000) #define SEQ_HUGE_FRAME (0x4000)
#define SEQ_RX_FRAME __constant_cpu_to_le16(0x8000) #define SEQ_RX_FRAME __constant_cpu_to_le16(0x8000)
#define SEQ_TO_SN(seq) (((seq) & IEEE80211_SCTL_SEQ) >> 4) #define SEQ_TO_SN(seq) (((seq) & IEEE80211_SCTL_SEQ) >> 4)