Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
+4
-1
drivers/net/wireless/hostap/hostap_wlan.h
+4
-1
drivers/net/wireless/hostap/hostap_wlan.h
···
918
919
/*
920
* TX meta data - stored in skb->cb buffer, so this must not be increased over
921
+
* the 48-byte limit.
922
+
* THE PADDING THIS STARTS WITH IS A HORRIBLE HACK THAT SHOULD NOT LIVE
923
+
* TO SEE THE DAY.
924
*/
925
struct hostap_skb_tx_data {
926
+
unsigned int __padding_for_default_qdiscs;
927
u32 magic; /* HOSTAP_SKB_TX_DATA_MAGIC */
928
u8 rate; /* transmit rate */
929
#define HOSTAP_TX_FLAGS_WDS BIT(0)
+3
drivers/net/wireless/rtl8187_dev.c
+3
drivers/net/wireless/rtl8187_dev.c
···
48
{USB_DEVICE(0x03f0, 0xca02), .driver_info = DEVICE_RTL8187},
49
/* Sitecom */
50
{USB_DEVICE(0x0df6, 0x000d), .driver_info = DEVICE_RTL8187},
51
+
{USB_DEVICE(0x0df6, 0x0028), .driver_info = DEVICE_RTL8187B},
52
+
/* Abocom */
53
+
{USB_DEVICE(0x13d1, 0xabe6), .driver_info = DEVICE_RTL8187},
54
{}
55
};
56
+3
-3
net/mac80211/mlme.c
+3
-3
net/mac80211/mlme.c
···
2570
2571
switch (notif_type) {
2572
case IEEE80211_NOTIFY_RE_ASSOC:
2573
-
rcu_read_lock();
2574
-
list_for_each_entry_rcu(sdata, &local->interfaces, list) {
2575
if (sdata->vif.type != NL80211_IFTYPE_STATION)
2576
continue;
2577
2578
ieee80211_sta_req_auth(sdata, &sdata->u.sta);
2579
}
2580
-
rcu_read_unlock();
2581
break;
2582
}
2583
}
···
2570
2571
switch (notif_type) {
2572
case IEEE80211_NOTIFY_RE_ASSOC:
2573
+
rtnl_lock();
2574
+
list_for_each_entry(sdata, &local->interfaces, list) {
2575
if (sdata->vif.type != NL80211_IFTYPE_STATION)
2576
continue;
2577
2578
ieee80211_sta_req_auth(sdata, &sdata->u.sta);
2579
}
2580
+
rtnl_unlock();
2581
break;
2582
}
2583
}