diff options
| author | David S. Miller <davem@davemloft.net> | 2009-10-09 00:55:21 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-10-09 00:55:21 +0200 |
| commit | 67972e0c238fa802580b5919f11e1de3da5179da (patch) | |
| tree | 27022c957154a9d36fc8aa0f020bed523e7849b3 /drivers/net/wireless/iwlwifi/iwl-3945.c | |
| parent | netlink: fix typo in initialization (diff) | |
| parent | cfg80211: fix netns error unwinding bug (diff) | |
| download | linux-67972e0c238fa802580b5919f11e1de3da5179da.tar.xz linux-67972e0c238fa802580b5919f11e1de3da5179da.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-3945.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-3945.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c index e70c5b0af364..231c833f6469 100644 --- a/drivers/net/wireless/iwlwifi/iwl-3945.c +++ b/drivers/net/wireless/iwlwifi/iwl-3945.c @@ -610,7 +610,7 @@ static void iwl3945_rx_reply_rx(struct iwl_priv *priv, if (rx_status.band == IEEE80211_BAND_5GHZ) rx_status.rate_idx -= IWL_FIRST_OFDM_RATE; - rx_status.antenna = le16_to_cpu(rx_hdr->phy_flags & + rx_status.antenna = (le16_to_cpu(rx_hdr->phy_flags) & RX_RES_PHY_FLAGS_ANTENNA_MSK) >> 4; /* set the preamble flag if appropriate */ |