Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ddd535c7 authored by David S. Miller's avatar David S. Miller
Browse files

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

parents e23a59e1 f7cd1686

drivers/net/wireless/hostap/hostap_wlan.h

+4 −1
Original line number Diff line number Diff line
@@ -918,9 +918,12 @@ struct hostap_interface { 


/*

 * 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 {

	unsigned int __padding_for_default_qdiscs;

	u32 magic; /* HOSTAP_SKB_TX_DATA_MAGIC */

	u8 rate; /* transmit rate */

#define HOSTAP_TX_FLAGS_WDS BIT(0)

drivers/net/wireless/rtl8187_dev.c

+3 −0
Original line number Diff line number Diff line
@@ -48,6 +48,9 @@ static struct usb_device_id rtl8187_table[] __devinitdata = { 
	{USB_DEVICE(0x03f0, 0xca02), .driver_info = DEVICE_RTL8187},

	/* Sitecom */

	{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},

	{}

};

net/mac80211/mlme.c

+3 −3
Original line number Diff line number Diff line
@@ -2570,14 +2570,14 @@ void ieee80211_notify_mac(struct ieee80211_hw *hw, 


	switch (notif_type) {

	case IEEE80211_NOTIFY_RE_ASSOC:

		rcu_read_lock();

		list_for_each_entry_rcu(sdata, &local->interfaces, list) {

		rtnl_lock();

		list_for_each_entry(sdata, &local->interfaces, list) {

			if (sdata->vif.type != NL80211_IFTYPE_STATION)

				continue;



			ieee80211_sta_req_auth(sdata, &sdata->u.sta);

		}

		rcu_read_unlock();

		rtnl_unlock();

		break;

	}

}