redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

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

Browse source
This commit is contained in:
David S. Miller 2008-11-12 14:37:29 -08:00
parent e23a59e1ca f7cd168645
commit ddd535c713
3 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/net/wireless/hostap/hostap_wlan.h
View file

@ -918,9 +918,12 @@ struct hostap_interface {
/* /*
* TX meta data - stored in skb->cb buffer, so this must not be increased over * TX meta data - stored in skb->cb buffer, so this must not be increased over
* the 40-byte limit * the 48-byte limit.
* THE PADDING THIS STARTS WITH IS A HORRIBLE HACK THAT SHOULD NOT LIVE
* TO SEE THE DAY.
*/ */
struct hostap_skb_tx_data { struct hostap_skb_tx_data {
unsigned int __padding_for_default_qdiscs;
u32 magic; /* HOSTAP_SKB_TX_DATA_MAGIC */ u32 magic; /* HOSTAP_SKB_TX_DATA_MAGIC */
u8 rate; /* transmit rate */ u8 rate; /* transmit rate */
#define HOSTAP_TX_FLAGS_WDS BIT(0) #define HOSTAP_TX_FLAGS_WDS BIT(0)

3
drivers/net/wireless/rtl8187_dev.c
View file

@ -48,6 +48,9 @@ static struct usb_device_id rtl8187_table[] __devinitdata = {
{USB_DEVICE(0x03f0, 0xca02), .driver_info = DEVICE_RTL8187}, {USB_DEVICE(0x03f0, 0xca02), .driver_info = DEVICE_RTL8187},
/* Sitecom */ /* Sitecom */
{USB_DEVICE(0x0df6, 0x000d), .driver_info = DEVICE_RTL8187}, {USB_DEVICE(0x0df6, 0x000d), .driver_info = DEVICE_RTL8187},
{USB_DEVICE(0x0df6, 0x0028), .driver_info = DEVICE_RTL8187B},
/* Abocom */
{USB_DEVICE(0x13d1, 0xabe6), .driver_info = DEVICE_RTL8187},
{} {}
}; };

6
net/mac80211/mlme.c
View file

@ -2570,14 +2570,14 @@ void ieee80211_notify_mac(struct ieee80211_hw *hw,
switch (notif_type) { switch (notif_type) {
case IEEE80211_NOTIFY_RE_ASSOC: case IEEE80211_NOTIFY_RE_ASSOC:
rcu_read_lock(); rtnl_lock();
list_for_each_entry_rcu(sdata, &local->interfaces, list) { list_for_each_entry(sdata, &local->interfaces, list) {
if (sdata->vif.type != NL80211_IFTYPE_STATION) if (sdata->vif.type != NL80211_IFTYPE_STATION)
continue; continue;
ieee80211_sta_req_auth(sdata, &sdata->u.sta); ieee80211_sta_req_auth(sdata, &sdata->u.sta);
} }
rcu_read_unlock(); rtnl_unlock();
break; break;
} }
} }