diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-4965.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-4965.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c index 0171bb8cbbc6..73e8a24eb9ce 100644 --- a/drivers/net/wireless/iwlwifi/iwl-4965.c +++ b/drivers/net/wireless/iwlwifi/iwl-4965.c | |||
@@ -3296,6 +3296,7 @@ static void iwl4965_add_radiotap(struct iwl_priv *priv, | |||
3296 | s8 noise = 0; | 3296 | s8 noise = 0; |
3297 | int rate = stats->rate_idx; | 3297 | int rate = stats->rate_idx; |
3298 | u64 tsf = stats->mactime; | 3298 | u64 tsf = stats->mactime; |
3299 | __le16 antenna; | ||
3299 | __le16 phy_flags_hw = rx_start->phy_flags; | 3300 | __le16 phy_flags_hw = rx_start->phy_flags; |
3300 | struct iwl4965_rt_rx_hdr { | 3301 | struct iwl4965_rt_rx_hdr { |
3301 | struct ieee80211_radiotap_header rt_hdr; | 3302 | struct ieee80211_radiotap_header rt_hdr; |
@@ -3380,8 +3381,8 @@ static void iwl4965_add_radiotap(struct iwl_priv *priv, | |||
3380 | * new 802.11n radiotap field "RX chains" that is defined | 3381 | * new 802.11n radiotap field "RX chains" that is defined |
3381 | * as a bitmask. | 3382 | * as a bitmask. |
3382 | */ | 3383 | */ |
3383 | iwl4965_rt->rt_antenna = | 3384 | antenna = phy_flags_hw & RX_RES_PHY_FLAGS_ANTENNA_MSK; |
3384 | le16_to_cpu(phy_flags_hw & RX_RES_PHY_FLAGS_ANTENNA_MSK) >> 4; | 3385 | iwl4965_rt->rt_antenna = le16_to_cpu(antenna) >> 4; |
3385 | 3386 | ||
3386 | /* set the preamble flag if appropriate */ | 3387 | /* set the preamble flag if appropriate */ |
3387 | if (phy_flags_hw & RX_RES_PHY_FLAGS_SHORT_PREAMBLE_MSK) | 3388 | if (phy_flags_hw & RX_RES_PHY_FLAGS_SHORT_PREAMBLE_MSK) |