iwlwifi: fix some warnings

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>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c
index eb30819cddc4..0d3cc3559039 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945.c
+++ b/drivers/net/wireless/iwlwifi/iwl-3945.c
@@ -524,7 +524,7 @@ static void iwl3945_add_radiotap(struct iwl3945_priv *priv,
         s8 noise = 0;
         int rate = stats->rate_idx;
         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 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;
 
         /* antenna number */
-        iwl3945_rt->rt_antenna =
-                le16_to_cpu(phy_flags_hw & RX_RES_PHY_FLAGS_ANTENNA_MSK) >> 4;
+        antenna = phy_flags_hw & RX_RES_PHY_FLAGS_ANTENNA_MSK;
+        iwl3945_rt->rt_antenna = le16_to_cpu(antenna) >> 4;
 
         /* set the preamble flag if we have it */
         if (phy_flags_hw & RX_RES_PHY_FLAGS_SHORT_PREAMBLE_MSK)