Please pull 'fixes-davem' branch of wireless-2.6
Subsystems (4)
These are a few more items intended for 2.6.23.
Individual patches available here:
http://www.kernel.org/pub/linux/kernel/people/linville/wireless-2.6/fixes-davem
Thanks!
John
---
The following changes since commit 39d3520c92cf7a28c07229ca00cc35a1e8026c77:
Linus Torvalds (1):
Linux 2.6.23-rc3
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git fixes-davem
Johannes Berg (1):
mac80211: fix tx status frame code
John W. Linville (1):
mac80211: probe for hidden SSIDs in pre-auth scan
net/mac80211/ieee80211.c | 1 - net/mac80211/ieee80211_sta.c | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-)
net/mac80211/ieee80211.c +0 -1
@@ -4678,7 +4678,6 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb,memset (skb->cb,0 ,sizeof (skb->cb));netif_rx (skb); skb = skb2; -break ; } } out:
net/mac80211/ieee80211_sta.c +5 -1
@@ -2154,7 +2154,11 @@ static int ieee80211_sta_config_auth(struct net_device *dev,return 0 ; }else {if (ifsta->state !=IEEE80211_AUTHENTICATE ) { -ieee80211_sta_start_scan (dev,NULL ,0 ); +if (ifsta->auto_ssid_sel) +ieee80211_sta_start_scan (dev,NULL ,0 ); +else +ieee80211_sta_start_scan (dev, ifsta->ssid, + ifsta->ssid_len); ifsta->state =IEEE80211_AUTHENTICATE ;set_bit (IEEE80211_STA_REQ_AUTH , &ifsta->request); }else
Signature · 2 lines
John W. Linville [email protected]
Please pull 'upstream-davem' branch of wireless-2.6
In reply to a message not in the archiveMore items intended for 2.6.24, based-off the preceding fixes-davem request.
Individual patches available here:
http://www.kernel.org/pub/linux/kernel/people/linville/wireless-2.6/upstream-davem
Thanks!
John
---
The following changes since commit b9bf1e60a294fc7795d5198f94a917290e52865b:
John W. Linville (1):
mac80211: probe for hidden SSIDs in pre-auth scan
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git upstream-davem
Johannes Berg (1):
radiotap parser: accept all other fields
Larry Finger (1):
mac80211: Add SIOCGIWTXPOWER routine
net/mac80211/ieee80211_ioctl.c | 16 +++++++++++++++- net/wireless/radiotap.c | 6 +++++- 2 files changed, 20 insertions(+), 2 deletions(-)
net/mac80211/ieee80211_ioctl.c +15 -1
@@ -798,6 +798,20 @@ static int ieee80211_ioctl_giwrate(struct net_device *dev,return 0 ; } +static int ieee80211_ioctl_giwtxpower (struct net_device *dev, +struct iw_request_info *info, +union iwreq_data *data,char *extra) +{ +struct ieee80211_local *local =wdev_priv (dev->ieee80211_ptr); + + data->txpower.fixed =1 ; + data->txpower.disabled = !(local->hw.conf.radio_enabled); + data->txpower.value = local->hw.conf.power_level; + data->txpower.flags =IW_TXPOW_DBM ; + +return 0 ; +} +static int ieee80211_ioctl_siwrts (struct net_device *dev,struct iw_request_info *info,struct iw_param *rts,char *extra)
@@ -1580,7 +1594,7 @@ static const iw_handler ieee80211_handler[] = (iw_handler ) ieee80211_ioctl_siwfrag,/* SIOCSIWFRAG */ (iw_handler ) ieee80211_ioctl_giwfrag,/* SIOCGIWFRAG */ (iw_handler )NULL ,/* SIOCSIWTXPOW */ - (iw_handler )NULL ,/* SIOCGIWTXPOW */ + (iw_handler ) ieee80211_ioctl_giwtxpower,/* SIOCGIWTXPOW */ (iw_handler ) ieee80211_ioctl_siwretry,/* SIOCSIWRETRY */ (iw_handler ) ieee80211_ioctl_giwretry,/* SIOCGIWRETRY */ (iw_handler) ieee80211_ioctl_siwencode, /* SIOCSIWENCODE */
net/wireless/radiotap.c +5 -1
@@ -161,7 +161,11 @@ int ieee80211_radiotap_iterator_next( [IEEE80211_RADIOTAP_DBM_TX_POWER] = 0x11, [IEEE80211_RADIOTAP_ANTENNA] = 0x11, [IEEE80211_RADIOTAP_DB_ANTSIGNAL] = 0x11, - [IEEE80211_RADIOTAP_DB_ANTNOISE ] =0x11 + [IEEE80211_RADIOTAP_DB_ANTNOISE] = 0x11, + [IEEE80211_RADIOTAP_RX_FLAGS] = 0x22, + [IEEE80211_RADIOTAP_TX_FLAGS] = 0x22, + [IEEE80211_RADIOTAP_RTS_RETRIES] = 0x11, + [IEEE80211_RADIOTAP_DATA_RETRIES] = 0x11,/* * add more here as they are defined in * include/net/ieee80211_radiotap.h
Signature · 2 lines
John W. Linville [email protected]
From: "John W. Linville" <[email protected]>
Date: Tue, 14 Aug 2007 20:32:34 -0400
Quoted 1 line
These are a few more items intended for 2.6.23.
...
Quoted 6 lines
The following changes since commit
39d3520c92cf7a28c07229ca00cc35a1e8026c77:
Linus Torvalds (1):Linux 2.6.23-rc3are available in the git repository at:
Quoted 7 lines
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.gitfixes-davemJohannes Berg (1):
mac80211: fix tx status frame codeJohn W. Linville (1):
mac80211: probe for hidden SSIDs in pre-auth scan
Pulled, thanks John.
Re: Please pull 'upstream-davem' branch of wireless-2.6
In reply to a message not in the archiveFrom: "John W. Linville" <[email protected]>
Date: Tue, 14 Aug 2007 20:34:10 -0400
Quoted 3 lines
Individual patches available here:
http://www.kernel.org/pub/linux/kernel/people/linville/wireless-2.6/upstream-davem
John, what I'm going to do is wait for Linus to pull in the 2.6.23 mac80211 fixes you submitted yesterday, then rebase the net-2.6.24 tree and add these fixes on top.
Take care.
Re: Please pull 'upstream-davem' branch of wireless-2.6
In reply to a message not in the archiveFrom: "John W. Linville" <[email protected]>
Date: Tue, 14 Aug 2007 20:34:10 -0400
Quoted 5 lines
Johannes Berg (1):
radiotap parser: accept all other fieldsLarry Finger (1):
mac80211: Add SIOCGIWTXPOWER routine
I've rebased net-2.6.24 and added in these two wireless patches, thanks!