diff options
| author | David S. Miller <davem@davemloft.net> | 2008-08-02 09:08:51 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-08-02 09:08:51 +0400 |
| commit | e9e80ea5f2129e135e3a6fa260314b1c6d99b19a (patch) | |
| tree | db20dc85b0e620ea3fcaf86a9026d6df7cb2e168 /drivers/net/wireless/iwlwifi/iwl-3945.c | |
| parent | 2b12a4c524812fb3f6ee590a02e65b95c8c32229 (diff) | |
| parent | 56decd3c5758b0d776c073f65f777beb7a05ac0a (diff) | |
| download | linux-e9e80ea5f2129e135e3a6fa260314b1c6d99b19a.tar.xz | |
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 | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c index a51e0eaa1334..56a9361a847f 100644 --- a/drivers/net/wireless/iwlwifi/iwl-3945.c +++ b/drivers/net/wireless/iwlwifi/iwl-3945.c @@ -710,10 +710,7 @@ static void iwl3945_rx_reply_rx(struct iwl3945_priv *priv, return; } - if (priv->iw_mode == IEEE80211_IF_TYPE_MNTR) { - iwl3945_pass_packet_to_mac80211(priv, rxb, &rx_status); - return; - } + /* Convert 3945's rssi indicator to dBm */ rx_status.signal = rx_stats->rssi - IWL_RSSI_OFFSET; @@ -775,6 +772,11 @@ static void iwl3945_rx_reply_rx(struct iwl3945_priv *priv, priv->last_rx_noise = rx_status.noise; } + if (priv->iw_mode == IEEE80211_IF_TYPE_MNTR) { + iwl3945_pass_packet_to_mac80211(priv, rxb, &rx_status); + return; + } + switch (le16_to_cpu(header->frame_control) & IEEE80211_FCTL_FTYPE) { case IEEE80211_FTYPE_MGMT: switch (le16_to_cpu(header->frame_control) & |