leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6

Browse Source
This commit is contained in:
David S. Miller 2008-07-02 22:13:20 -07:00
commit 2fff58fce1
5 changed files with 15 additions and 4 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

@ -588,8 +588,12 @@ static void iwl3945_add_radiotap(struct iwl3945_priv *priv,
if (rate == -1) if (rate == -1)
iwl3945_rt->rt_rate = 0; iwl3945_rt->rt_rate = 0;
else else {
if (stats->band == IEEE80211_BAND_5GHZ)
rate += IWL_FIRST_OFDM_RATE;
iwl3945_rt->rt_rate = iwl3945_rates[rate].ieee; iwl3945_rt->rt_rate = iwl3945_rates[rate].ieee;
}
/* antenna number */ /* antenna number */
antenna = phy_flags_hw & RX_RES_PHY_FLAGS_ANTENNA_MSK; antenna = phy_flags_hw & RX_RES_PHY_FLAGS_ANTENNA_MSK;

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

@ -3528,8 +3528,12 @@ static void iwl4965_add_radiotap(struct iwl_priv *priv,
if (rate == -1) if (rate == -1)
iwl4965_rt->rt_rate = 0; iwl4965_rt->rt_rate = 0;
else else {
if (stats->band == IEEE80211_BAND_5GHZ)
rate += IWL_FIRST_OFDM_RATE;
iwl4965_rt->rt_rate = iwl4965_rates[rate].ieee; iwl4965_rt->rt_rate = iwl4965_rates[rate].ieee;
}
/* /*
* "antenna number" * "antenna number"

3
drivers/net/wireless/iwlwifi/iwl3945-base.c
View File

@ -6687,7 +6687,8 @@ static int iwl3945_mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb,
if (priv->iw_mode == IEEE80211_IF_TYPE_MNTR) { if (priv->iw_mode == IEEE80211_IF_TYPE_MNTR) {
IWL_DEBUG_MAC80211("leave - monitor\n"); IWL_DEBUG_MAC80211("leave - monitor\n");
return -1; dev_kfree_skb_any(skb);
return 0;
} }
IWL_DEBUG_TX("dev->xmit(%d bytes) at rate 0x%02x\n", skb->len, IWL_DEBUG_TX("dev->xmit(%d bytes) at rate 0x%02x\n", skb->len,

3
drivers/net/wireless/iwlwifi/iwl4965-base.c
View File

@ -6237,7 +6237,8 @@ static int iwl4965_mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb,
if (priv->iw_mode == IEEE80211_IF_TYPE_MNTR) { if (priv->iw_mode == IEEE80211_IF_TYPE_MNTR) {
IWL_DEBUG_MAC80211("leave - monitor\n"); IWL_DEBUG_MAC80211("leave - monitor\n");
return -1; dev_kfree_skb_any(skb);
return 0;
} }
IWL_DEBUG_TX("dev->xmit(%d bytes) at rate 0x%02x\n", skb->len, IWL_DEBUG_TX("dev->xmit(%d bytes) at rate 0x%02x\n", skb->len,

1
drivers/net/wireless/libertas/if_usb.c
View File

@ -925,6 +925,7 @@ static struct usb_driver if_usb_driver = {
.id_table = if_usb_table, .id_table = if_usb_table,
.suspend = if_usb_suspend, .suspend = if_usb_suspend,
.resume = if_usb_resume, .resume = if_usb_resume,
.reset_resume = if_usb_resume,
}; };
static int __init if_usb_init_module(void) static int __init if_usb_init_module(void)