pull request: wireless-2.6 2009-01-16
Subsystems (7)
Dave,
Here is another batch of fixes intended for 2.6.29. Most of them are simple/obvious and/or their changelog cites the bug they are fixing. The "cfg80211: make handle_band() and handle_channel() wiphy specific" patch is a pre-requisite to the other patches from Luis.
Please let me know if there are problems!
Thanks,
John
---
Individual patches are available here:
http://www.kernel.org/pub/linux/kernel/people/linville/wireless-2.6/
---
The following changes since commit a58c891a53aca81c78f9cbe0572a301042470e96:
Eric Dumazet (1):
b44: GFP_DMA skb should not escape from driver
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git master
Andrey Yurovsky (1):
libertas: Fix alignment issues in libertas core
Artur Skawina (1):
p54: set_tim must be atomic.
Christian Lamparter (2):
p54: fix oops caused by bad eeproms
p54: fix p54_set_key's return code
Jouni Malinen (2):
ath9k: Fix an operator typo in phy rate validation
ath9k: Fix an operator typo in REG_DOMAIN_2GHZ_MASK
Luis R. Rodriguez (3):
cfg80211: make handle_band() and handle_channel() wiphy specific
cfg80211: Fix regression with 11d on bands
cfg80211: Fix parsed country IE info for 5 GHz
Rami Rosen (1):
rt2x00: fix a wrong parameter for __test_and_clear_bit() in rt2x00rfkill_free().
Randy Dunlap (1):
mac80211: more kernel-doc fixes
Zhu Yi (1):
iwlwifi: remove CMD_WANT_SKB flag if send_cmd_sync failure
drivers/net/wireless/ath9k/rc.c | 2 +- drivers/net/wireless/ath9k/regd_common.h | 2 +- drivers/net/wireless/iwlwifi/iwl-hcmd.c | 2 +- drivers/net/wireless/iwlwifi/iwl3945-base.c | 2 +- drivers/net/wireless/libertas/hostcmd.h | 91 ++++++++++---------- drivers/net/wireless/p54/p54common.c | 6 +- drivers/net/wireless/rt2x00/rt2x00rfkill.c | 2 +- include/net/mac80211.h | 1 - net/mac80211/sta_info.h | 1 - net/wireless/reg.c | 128 ++++++++++++++++++++++++--- 10 files changed, 170 insertions(+), 67 deletions(-)
arch/arm/mach-integrator/clock.h deleted +0 -0
drivers/net/wireless/ath9k/rc.c +1 -1
@@ -490,7 +490,7 @@ static inline int ath_rc_get_nextvalid_txrate(struct ath_rate_table *rate_table,static int ath_rc_valid_phyrate (u32 phy,u32 capflag,int ignore_cw) { -if (WLAN_RC_PHY_HT (phy) & !(capflag &WLAN_RC_HT_FLAG )) +if (WLAN_RC_PHY_HT (phy) && !(capflag &WLAN_RC_HT_FLAG ))return 0 ;if (WLAN_RC_PHY_DS (phy) && !(capflag &WLAN_RC_DS_FLAG ))return 0 ;
drivers/net/wireless/ath9k/regd_common.h +1 -1
@@ -228,7 +228,7 @@ enum { };#define REG_DOMAIN_2GHZ_MASK (REQ_MASK & \ - (!(ADHOC_NO_11A | DISALLOW_ADHOC_11A | DISALLOW_ADHOC_11A_TURB))) + (~(ADHOC_NO_11A | DISALLOW_ADHOC_11A | DISALLOW_ADHOC_11A_TURB)))#define REG_DOMAIN_5GHZ_MASK REQ_MASKstatic struct reg_dmn_pair_mapping regDomainPairs[] = {
drivers/net/wireless/iwlwifi/iwl-hcmd.c +1 -1
@@ -224,7 +224,7 @@ int iwl_send_cmd_sync(struct iwl_priv *priv, struct iwl_host_cmd *cmd)IWL_ERROR ("Error: Response NULL in '%s'\n" ,get_cmd_string (cmd->id)); ret = -EIO ; - goto out; + goto cancel; } ret =0 ;
drivers/net/wireless/iwlwifi/iwl3945-base.c +1 -1
@@ -745,7 +745,7 @@ static int iwl3945_send_cmd_sync(struct iwl3945_priv *priv, struct iwl3945_host_IWL_ERROR ("Error: Response NULL in '%s'\n" ,get_cmd_string (cmd->id)); ret = -EIO ; - goto out; + goto cancel; } ret =0 ;
drivers/net/wireless/libertas/hostcmd.h +45 -46
352 lines not on this page · raw message
drivers/net/wireless/p54/p54common.c +3 -3
@@ -1147,7 +1147,7 @@ static int p54_set_tim(struct ieee80211_hw *dev, struct ieee80211_sta *sta, skb =p54_alloc_skb (dev,P54_HDR_FLAG_CONTROL_OPSET ,sizeof (struct p54_hdr ) +sizeof (*tim), -P54_CONTROL_TYPE_TIM ,GFP_KERNEL ); +P54_CONTROL_TYPE_TIM ,GFP_ATOMIC );if (!skb)return -ENOMEM ;
@@ -1610,7 +1610,7 @@ static int p54_scan(struct ieee80211_hw *dev, u16 mode, u16 dwell) err:printk (KERN_ERR "%s: frequency change failed\n" ,wiphy_name (dev->wiphy)); -kfree_skb (skb); +p54_free_skb (dev, skb);return -EINVAL ; }
@@ -2077,7 +2077,7 @@ static int p54_set_key(struct ieee80211_hw *dev, enum set_key_cmd cmd, algo =P54_CRYPTO_AESCCMP ;break ;default : -return -EINVAL ; +return -EOPNOTSUPP ; } }
drivers/net/wireless/rt2x00/rt2x00rfkill.c +1 -1
@@ -162,7 +162,7 @@ void rt2x00rfkill_allocate(struct rt2x00_dev *rt2x00dev)void rt2x00rfkill_free (struct rt2x00_dev *rt2x00dev) { -if (!test_bit (RFKILL_STATE_ALLOCATED , &rt2x00dev->flags)) +if (!test_bit (RFKILL_STATE_ALLOCATED , &rt2x00dev->rfkill_state))return ;cancel_delayed_work_sync (&rt2x00dev->rfkill_work);
include/net/mac80211.h +0 -1
@@ -322,7 +322,6 @@ struct ieee80211_tx_rate {* @control: union for control data * @status: union for status data * @driver_data: array of driver_data pointers -* @retry_count: number of retries * @ampdu_ack_len: number of aggregated frames. * relevant only if IEEE80211_TX_STATUS_AMPDU was set. * @ampdu_ack_map: block ack bit map for the aggregation.
net/mac80211/sta_info.h +0 -1
@@ -195,7 +195,6 @@ struct sta_ampdu_mlme {* @tx_packets: number of RX/TX MSDUs * @tx_bytes: number of bytes transmitted to this STA * @tx_fragments: number of transmitted MPDUs -* @last_txrate: description of the last used transmit rate * @tid_seq: per-TID sequence numbers for sending to this STA * @ampdu_mlme: A-MPDU state machine state * @timer_to_tid: identity mapping to ID timers
net/wireless/reg.c +117 -11
204 lines not on this page · raw message
Signature · 2 lines
John W. Linville Someday the world will need a hero, and you [email protected] might be all we have. Be ready.
David Miller
maintainerFrom: "John W. Linville" <[email protected]>
Date: Fri, 16 Jan 2009 17:31:46 -0500
Quoted 4 lines
Here is another batch of fixes intended for 2.6.29. Most of them are simple/obvious and/or their changelog cites the bug they are fixing. The "cfg80211: make
handle_band()andhandle_channel()wiphy specific" patch is a pre-requisite to the other patches from Luis.
Pulled, thanks a lot John.