Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

John W. Linville
2 parents cd80e107b7 a986553877
Showing 17 changed files Side-by-side Diff
drivers/net/wireless/ath/ath6kl/wmi.c
drivers/net/wireless/ath/wil6210/wmi.c
drivers/net/wireless/brcm80211/brcmfmac/p2p.c
drivers/net/wireless/mac80211_hwsim.c
drivers/net/wireless/mwifiex/util.c
drivers/net/wireless/ti/wlcore/main.c
include/net/cfg80211.h
include/uapi/linux/nl80211.h
net/mac80211/iface.c
net/mac80211/main.c
net/mac80211/mesh.c
net/mac80211/rc80211_minstrel_ht.c
net/mac80211/rx.c
net/mac80211/tx.c
net/wireless/mlme.c
net/wireless/nl80211.c
net/wireless/nl80211.h
@@ -568,8 +568,8 @@
 		   dlen, freq, vif->probe_req_report);
  
 	if (vif->probe_req_report || vif->nw_type == AP_NETWORK)
-		cfg80211_rx_mgmt(&vif->wdev, freq, 0,
-				 ev->data, dlen, GFP_ATOMIC);
+		cfg80211_rx_mgmt(&vif->wdev, freq, 0, ev->data, dlen, 0,
+				 GFP_ATOMIC);
  
 	return 0;
 }
@@ -608,8 +608,7 @@
 		return -EINVAL;
 	}
 	ath6kl_dbg(ATH6KL_DBG_WMI, "rx_action: len=%u freq=%u\n", dlen, freq);
-	cfg80211_rx_mgmt(&vif->wdev, freq, 0,
-			 ev->data, dlen, GFP_ATOMIC);
+	cfg80211_rx_mgmt(&vif->wdev, freq, 0, ev->data, dlen, 0, GFP_ATOMIC);
  
 	return 0;
 }
@@ -339,7 +339,7 @@
 		}
 	} else {
 		cfg80211_rx_mgmt(wil->wdev, freq, signal,
-				 (void *)rx_mgmt_frame, d_len, GFP_KERNEL);
+				 (void *)rx_mgmt_frame, d_len, 0, GFP_KERNEL);
 	}
 }
  
@@ -1430,7 +1430,7 @@
 					      IEEE80211_BAND_5GHZ);
  
 	wdev = &ifp->vif->wdev;
-	cfg80211_rx_mgmt(wdev, freq, 0, (u8 *)mgmt_frame, mgmt_frame_len,
+	cfg80211_rx_mgmt(wdev, freq, 0, (u8 *)mgmt_frame, mgmt_frame_len, 0,
 			 GFP_ATOMIC);
  
 	kfree(mgmt_frame);
@@ -1895,7 +1895,7 @@
 					      IEEE80211_BAND_2GHZ :
 					      IEEE80211_BAND_5GHZ);
  
-	cfg80211_rx_mgmt(&vif->wdev, freq, 0, mgmt_frame, mgmt_frame_len,
+	cfg80211_rx_mgmt(&vif->wdev, freq, 0, mgmt_frame, mgmt_frame_len, 0,
 			 GFP_ATOMIC);
  
 	brcmf_dbg(INFO, "mgmt_frame_len (%d) , e->datalen (%d), chanspec (%04x), freq (%d)\n",
@@ -2528,8 +2528,10 @@
 	}
  
 	hwsim_mon = alloc_netdev(0, "hwsim%d", hwsim_mon_setup);
-	if (hwsim_mon == NULL)
+	if (hwsim_mon == NULL) {
+		err = -ENOMEM;
 		goto failed;
+	}
  
 	rtnl_lock();
  
@@ -171,8 +171,8 @@
 	rx_pd->rx_pkt_length = cpu_to_le16(pkt_len);
  
 	cfg80211_rx_mgmt(priv->wdev, priv->roc_cfg.chan.center_freq,
-			 CAL_RSSI(rx_pd->snr, rx_pd->nf),
-			 skb->data, pkt_len, GFP_ATOMIC);
+			 CAL_RSSI(rx_pd->snr, rx_pd->nf), skb->data, pkt_len,
+			 0, GFP_ATOMIC);
  
 	return 0;
 }
@@ -5623,7 +5623,8 @@
 	wl->hw->wiphy->max_remain_on_channel_duration = 5000;
  
 	wl->hw->wiphy->flags |= WIPHY_FLAG_AP_UAPSD |
-				WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL;
+				WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL |
+				WIPHY_FLAG_SUPPORTS_SCHED_SCAN;
  
 	/* make sure all our channels fit in the scanned_ch bitmask */
 	BUILD_BUG_ON(ARRAY_SIZE(wl1271_channels) +
@@ -4056,6 +4056,7 @@
  * @sig_dbm: signal strength in mBm, or 0 if unknown
  * @buf: Management frame (header + body)
  * @len: length of the frame data
+ * @flags: flags, as defined in enum nl80211_rxmgmt_flags
  * @gfp: context flags
  *
  * This function is called whenever an Action frame is received for a station
@@ -4067,7 +4068,7 @@
  * driver is responsible for rejecting the frame.
  */
 bool cfg80211_rx_mgmt(struct wireless_dev *wdev, int freq, int sig_dbm,
-		      const u8 *buf, size_t len, gfp_t gfp);
+		      const u8 *buf, size_t len, u32 flags, gfp_t gfp);
  
 /**
  * cfg80211_mgmt_tx_status - notification of TX status for management frame
@@ -1493,6 +1493,9 @@
  * @NL80211_ATTR_CSA_C_OFF_PRESP: Offset of the channel switch counter
  *	field in the probe response (%NL80211_ATTR_PROBE_RESP).
  *
+ * @NL80211_ATTR_RXMGMT_FLAGS: flags for nl80211_send_mgmt(), u32.
+ *	As specified in the &enum nl80211_rxmgmt_flags.
+ *
  * @NL80211_ATTR_MAX: highest attribute number currently defined
  * @__NL80211_ATTR_AFTER_LAST: internal use
  */
@@ -1801,6 +1804,8 @@
 	NL80211_ATTR_CSA_C_OFF_BEACON,
 	NL80211_ATTR_CSA_C_OFF_PRESP,
  
+	NL80211_ATTR_RXMGMT_FLAGS,
+
 	/* add attributes here, update the policy in nl80211.c */
  
 	__NL80211_ATTR_AFTER_LAST,
@@ -3900,6 +3905,17 @@
  
 /* maximum duration for critical protocol measures */
 #define NL80211_CRIT_PROTO_MAX_DURATION		5000 /* msec */
+
+/**
+ * enum nl80211_rxmgmt_flags - flags for received management frame.
+ *
+ * Used by cfg80211_rx_mgmt()
+ *
+ * @NL80211_RXMGMT_FLAG_ANSWERED: frame was answered by device/driver.
+ */
+enum nl80211_rxmgmt_flags {
+	NL80211_RXMGMT_FLAG_ANSWERED = 1 << 0,
+};
  
 #endif /* __LINUX_NL80211_H */
@@ -308,12 +308,13 @@
 	return 0;
 }
  
-static int ieee80211_check_queues(struct ieee80211_sub_if_data *sdata)
+static int ieee80211_check_queues(struct ieee80211_sub_if_data *sdata,
+				  enum nl80211_iftype iftype)
 {
 	int n_queues = sdata->local->hw.queues;
 	int i;
  
-	if (sdata->vif.type != NL80211_IFTYPE_P2P_DEVICE) {
+	if (iftype != NL80211_IFTYPE_P2P_DEVICE) {
 		for (i = 0; i < IEEE80211_NUM_ACS; i++) {
 			if (WARN_ON_ONCE(sdata->vif.hw_queue[i] ==
 					 IEEE80211_INVAL_HW_QUEUE))
@@ -324,8 +325,9 @@
 		}
 	}
  
-	if ((sdata->vif.type != NL80211_IFTYPE_AP &&
-	     sdata->vif.type != NL80211_IFTYPE_MESH_POINT) ||
+	if ((iftype != NL80211_IFTYPE_AP &&
+	     iftype != NL80211_IFTYPE_P2P_GO &&
+	     iftype != NL80211_IFTYPE_MESH_POINT) ||
 	    !(sdata->local->hw.flags & IEEE80211_HW_QUEUE_CONTROL)) {
 		sdata->vif.cab_queue = IEEE80211_INVAL_HW_QUEUE;
 		return 0;
@@ -408,7 +410,7 @@
 		return ret;
 	}
  
-	ret = ieee80211_check_queues(sdata);
+	ret = ieee80211_check_queues(sdata, NL80211_IFTYPE_MONITOR);
 	if (ret) {
 		kfree(sdata);
 		return ret;
@@ -592,7 +594,8 @@
 			res = drv_add_interface(local, sdata);
 			if (res)
 				goto err_stop;
-			res = ieee80211_check_queues(sdata);
+			res = ieee80211_check_queues(sdata,
+				ieee80211_vif_type_p2p(&sdata->vif));
 			if (res)
 				goto err_del_interface;
 		}
  
@@ -1389,14 +1392,14 @@
  
 	ret = drv_change_interface(local, sdata, internal_type, p2p);
 	if (ret)
-		type = sdata->vif.type;
+		type = ieee80211_vif_type_p2p(&sdata->vif);
  
 	/*
 	 * Ignore return value here, there's not much we can do since
 	 * the driver changed the interface type internally already.
 	 * The warnings will hopefully make driver authors fix it :-)
 	 */
-	ieee80211_check_queues(sdata);
+	ieee80211_check_queues(sdata, type);
  
 	ieee80211_setup_sdata(sdata, type);
  
@@ -892,9 +892,6 @@
 	if (!local->ops->remain_on_channel)
 		local->hw.wiphy->max_remain_on_channel_duration = 5000;
  
-	if (local->ops->sched_scan_start)
-		local->hw.wiphy->flags |= WIPHY_FLAG_SUPPORTS_SCHED_SCAN;
-
 	/* mac80211 based drivers don't support internal TDLS setup */
 	if (local->hw.wiphy->flags & WIPHY_FLAG_SUPPORTS_TDLS)
 		local->hw.wiphy->flags |= WIPHY_FLAG_TDLS_EXTERNAL_SETUP;
@@ -832,6 +832,9 @@
  
 	ieee802_11_parse_elems(pos, len - baselen, false, &elems);
  
+	if (!elems.mesh_id)
+		return;
+
 	/* 802.11-2012 10.1.4.3.2 */
 	if ((!ether_addr_equal(mgmt->da, sdata->vif.addr) &&
 	     !is_broadcast_ether_addr(mgmt->da)) ||
@@ -439,13 +439,12 @@
 {
 	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
 	struct sta_info *sta = container_of(pubsta, struct sta_info, sta);
-	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
 	u16 tid;
  
 	if (unlikely(!ieee80211_is_data_qos(hdr->frame_control)))
 		return;
  
-	if (unlikely(info->control.flags & IEEE80211_TX_CTRL_PORT_CTRL_PROTO))
+	if (unlikely(skb->protocol == cpu_to_be16(ETH_P_PAE)))
 		return;
  
 	tid = *ieee80211_get_qos_ctl(hdr) & IEEE80211_QOS_CTL_TID_MASK;
@@ -2684,8 +2684,7 @@
 		sig = status->signal;
  
 	if (cfg80211_rx_mgmt(&rx->sdata->wdev, status->freq, sig,
-			     rx->skb->data, rx->skb->len,
-			     GFP_ATOMIC)) {
+			     rx->skb->data, rx->skb->len, 0, GFP_ATOMIC)) {
 		if (rx->sta)
 			rx->sta->rx_packets++;
 		dev_kfree_skb(rx->skb);
@@ -781,9 +781,11 @@
 	/*
 	 * Anything but QoS data that has a sequence number field
 	 * (is long enough) gets a sequence number from the global
-	 * counter.
+	 * counter.  QoS data frames with a multicast destination
+	 * also use the global counter (802.11-2012 9.3.2.10).
 	 */
-	if (!ieee80211_is_data_qos(hdr->frame_control)) {
+	if (!ieee80211_is_data_qos(hdr->frame_control) ||
+	    is_multicast_ether_addr(hdr->addr1)) {
 		/* driver should assign sequence number */
 		info->flags |= IEEE80211_TX_CTL_ASSIGN_SEQ;
 		/* for pure STA mode without beacons, we can do it */
@@ -621,7 +621,7 @@
 }
  
 bool cfg80211_rx_mgmt(struct wireless_dev *wdev, int freq, int sig_mbm,
-		      const u8 *buf, size_t len, gfp_t gfp)
+		      const u8 *buf, size_t len, u32 flags, gfp_t gfp)
 {
 	struct wiphy *wiphy = wdev->wiphy;
 	struct cfg80211_registered_device *rdev = wiphy_to_dev(wiphy);
@@ -664,7 +664,7 @@
 		/* Indicate the received Action frame to user space */
 		if (nl80211_send_mgmt(rdev, wdev, reg->nlportid,
 				      freq, sig_mbm,
-				      buf, len, gfp))
+				      buf, len, flags, gfp))
 			continue;
  
 		result = true;
@@ -10450,7 +10450,7 @@
 int nl80211_send_mgmt(struct cfg80211_registered_device *rdev,
 		      struct wireless_dev *wdev, u32 nlportid,
 		      int freq, int sig_dbm,
-		      const u8 *buf, size_t len, gfp_t gfp)
+		      const u8 *buf, size_t len, u32 flags, gfp_t gfp)
 {
 	struct net_device *netdev = wdev->netdev;
 	struct sk_buff *msg;
@@ -10473,7 +10473,9 @@
 	    nla_put_u32(msg, NL80211_ATTR_WIPHY_FREQ, freq) ||
 	    (sig_dbm &&
 	     nla_put_u32(msg, NL80211_ATTR_RX_SIGNAL_DBM, sig_dbm)) ||
-	    nla_put(msg, NL80211_ATTR_FRAME, len, buf))
+	    nla_put(msg, NL80211_ATTR_FRAME, len, buf) ||
+	    (flags &&
+	     nla_put_u32(msg, NL80211_ATTR_RXMGMT_FLAGS, flags)))
 		goto nla_put_failure;
  
 	genlmsg_end(msg, hdr);
@@ -66,7 +66,7 @@
 int nl80211_send_mgmt(struct cfg80211_registered_device *rdev,
 		      struct wireless_dev *wdev, u32 nlpid,
 		      int freq, int sig_dbm,
-		      const u8 *buf, size_t len, gfp_t gfp);
+		      const u8 *buf, size_t len, u32 flags, gfp_t gfp);
  
 void
 nl80211_radar_notify(struct cfg80211_registered_device *rdev,
...	...	@@ -568,8 +568,8 @@
568	568	dlen, freq, vif->probe_req_report);
569	569
570	570	if (vif->probe_req_report \|\| vif->nw_type == AP_NETWORK)
571		- cfg80211_rx_mgmt(&vif->wdev, freq, 0,
572		- ev->data, dlen, GFP_ATOMIC);
	571	+ cfg80211_rx_mgmt(&vif->wdev, freq, 0, ev->data, dlen, 0,
	572	+ GFP_ATOMIC);
573	573
574	574	return 0;
575	575	}
...	...	@@ -608,8 +608,7 @@
608	608	return -EINVAL;
609	609	}
610	610	ath6kl_dbg(ATH6KL_DBG_WMI, "rx_action: len=%u freq=%u\n", dlen, freq);
611		- cfg80211_rx_mgmt(&vif->wdev, freq, 0,
612		- ev->data, dlen, GFP_ATOMIC);
	611	+ cfg80211_rx_mgmt(&vif->wdev, freq, 0, ev->data, dlen, 0, GFP_ATOMIC);
613	612
614	613	return 0;
615	614	}
...	...	@@ -339,7 +339,7 @@
339	339	}
340	340	} else {
341	341	cfg80211_rx_mgmt(wil->wdev, freq, signal,
342		- (void *)rx_mgmt_frame, d_len, GFP_KERNEL);
	342	+ (void *)rx_mgmt_frame, d_len, 0, GFP_KERNEL);
343	343	}
344	344	}
345	345
...	...	@@ -1430,7 +1430,7 @@
1430	1430	IEEE80211_BAND_5GHZ);
1431	1431
1432	1432	wdev = &ifp->vif->wdev;
1433		- cfg80211_rx_mgmt(wdev, freq, 0, (u8 *)mgmt_frame, mgmt_frame_len,
	1433	+ cfg80211_rx_mgmt(wdev, freq, 0, (u8 *)mgmt_frame, mgmt_frame_len, 0,
1434	1434	GFP_ATOMIC);
1435	1435
1436	1436	kfree(mgmt_frame);
...	...	@@ -1895,7 +1895,7 @@
1895	1895	IEEE80211_BAND_2GHZ :
1896	1896	IEEE80211_BAND_5GHZ);
1897	1897
1898		- cfg80211_rx_mgmt(&vif->wdev, freq, 0, mgmt_frame, mgmt_frame_len,
	1898	+ cfg80211_rx_mgmt(&vif->wdev, freq, 0, mgmt_frame, mgmt_frame_len, 0,
1899	1899	GFP_ATOMIC);
1900	1900
1901	1901	brcmf_dbg(INFO, "mgmt_frame_len (%d) , e->datalen (%d), chanspec (%04x), freq (%d)\n",
...	...	@@ -2528,8 +2528,10 @@
2528	2528	}
2529	2529
2530	2530	hwsim_mon = alloc_netdev(0, "hwsim%d", hwsim_mon_setup);
2531		- if (hwsim_mon == NULL)
	2531	+ if (hwsim_mon == NULL) {
	2532	+ err = -ENOMEM;
2532	2533	goto failed;
	2534	+ }
2533	2535
2534	2536	rtnl_lock();
2535	2537
...	...	@@ -171,8 +171,8 @@
171	171	rx_pd->rx_pkt_length = cpu_to_le16(pkt_len);
172	172
173	173	cfg80211_rx_mgmt(priv->wdev, priv->roc_cfg.chan.center_freq,
174		- CAL_RSSI(rx_pd->snr, rx_pd->nf),
175		- skb->data, pkt_len, GFP_ATOMIC);
	174	+ CAL_RSSI(rx_pd->snr, rx_pd->nf), skb->data, pkt_len,
	175	+ 0, GFP_ATOMIC);
176	176
177	177	return 0;
178	178	}
...	...	@@ -5623,7 +5623,8 @@
5623	5623	wl->hw->wiphy->max_remain_on_channel_duration = 5000;
5624	5624
5625	5625	wl->hw->wiphy->flags \|= WIPHY_FLAG_AP_UAPSD \|
5626		- WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL;
	5626	+ WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL \|
	5627	+ WIPHY_FLAG_SUPPORTS_SCHED_SCAN;
5627	5628
5628	5629	/* make sure all our channels fit in the scanned_ch bitmask */
5629	5630	BUILD_BUG_ON(ARRAY_SIZE(wl1271_channels) +
...	...	@@ -4056,6 +4056,7 @@
4056	4056	* @sig_dbm: signal strength in mBm, or 0 if unknown
4057	4057	* @buf: Management frame (header + body)
4058	4058	* @len: length of the frame data
	4059	+ * @flags: flags, as defined in enum nl80211_rxmgmt_flags
4059	4060	* @gfp: context flags
4060	4061	*
4061	4062	* This function is called whenever an Action frame is received for a station
...	...	@@ -4067,7 +4068,7 @@
4067	4068	* driver is responsible for rejecting the frame.
4068	4069	*/
4069	4070	bool cfg80211_rx_mgmt(struct wireless_dev *wdev, int freq, int sig_dbm,
4070		- const u8 *buf, size_t len, gfp_t gfp);
	4071	+ const u8 *buf, size_t len, u32 flags, gfp_t gfp);
4071	4072
4072	4073	/**
4073	4074	* cfg80211_mgmt_tx_status - notification of TX status for management frame
...	...	@@ -1493,6 +1493,9 @@
1493	1493	* @NL80211_ATTR_CSA_C_OFF_PRESP: Offset of the channel switch counter
1494	1494	* field in the probe response (%NL80211_ATTR_PROBE_RESP).
1495	1495	*
	1496	+ * @NL80211_ATTR_RXMGMT_FLAGS: flags for nl80211_send_mgmt(), u32.
	1497	+ * As specified in the &enum nl80211_rxmgmt_flags.
	1498	+ *
1496	1499	* @NL80211_ATTR_MAX: highest attribute number currently defined
1497	1500	* @__NL80211_ATTR_AFTER_LAST: internal use
1498	1501	*/
...	...	@@ -1801,6 +1804,8 @@
1801	1804	NL80211_ATTR_CSA_C_OFF_BEACON,
1802	1805	NL80211_ATTR_CSA_C_OFF_PRESP,
1803	1806
	1807	+ NL80211_ATTR_RXMGMT_FLAGS,
	1808	+
1804	1809	/* add attributes here, update the policy in nl80211.c */
1805	1810
1806	1811	__NL80211_ATTR_AFTER_LAST,
...	...	@@ -3900,6 +3905,17 @@
3900	3905
3901	3906	/* maximum duration for critical protocol measures */
3902	3907	#define NL80211_CRIT_PROTO_MAX_DURATION 5000 /* msec */
	3908	+
	3909	+/**
	3910	+ * enum nl80211_rxmgmt_flags - flags for received management frame.
	3911	+ *
	3912	+ * Used by cfg80211_rx_mgmt()
	3913	+ *
	3914	+ * @NL80211_RXMGMT_FLAG_ANSWERED: frame was answered by device/driver.
	3915	+ */
	3916	+enum nl80211_rxmgmt_flags {
	3917	+ NL80211_RXMGMT_FLAG_ANSWERED = 1 << 0,
	3918	+};
3903	3919
3904	3920	#endif /* __LINUX_NL80211_H */
...	...	@@ -308,12 +308,13 @@
308	308	return 0;
309	309	}
310	310
311		-static int ieee80211_check_queues(struct ieee80211_sub_if_data *sdata)
	311	+static int ieee80211_check_queues(struct ieee80211_sub_if_data *sdata,
	312	+ enum nl80211_iftype iftype)
312	313	{
313	314	int n_queues = sdata->local->hw.queues;
314	315	int i;
315	316
316		- if (sdata->vif.type != NL80211_IFTYPE_P2P_DEVICE) {
	317	+ if (iftype != NL80211_IFTYPE_P2P_DEVICE) {
317	318	for (i = 0; i < IEEE80211_NUM_ACS; i++) {
318	319	if (WARN_ON_ONCE(sdata->vif.hw_queue[i] ==
319	320	IEEE80211_INVAL_HW_QUEUE))
...	...	@@ -324,8 +325,9 @@
324	325	}
325	326	}
326	327
327		- if ((sdata->vif.type != NL80211_IFTYPE_AP &&
328		- sdata->vif.type != NL80211_IFTYPE_MESH_POINT) \|\|
	328	+ if ((iftype != NL80211_IFTYPE_AP &&
	329	+ iftype != NL80211_IFTYPE_P2P_GO &&
	330	+ iftype != NL80211_IFTYPE_MESH_POINT) \|\|
329	331	!(sdata->local->hw.flags & IEEE80211_HW_QUEUE_CONTROL)) {
330	332	sdata->vif.cab_queue = IEEE80211_INVAL_HW_QUEUE;
331	333	return 0;
...	...	@@ -408,7 +410,7 @@
408	410	return ret;
409	411	}
410	412
411		- ret = ieee80211_check_queues(sdata);
	413	+ ret = ieee80211_check_queues(sdata, NL80211_IFTYPE_MONITOR);
412	414	if (ret) {
413	415	kfree(sdata);
414	416	return ret;
...	...	@@ -592,7 +594,8 @@
592	594	res = drv_add_interface(local, sdata);
593	595	if (res)
594	596	goto err_stop;
595		- res = ieee80211_check_queues(sdata);
	597	+ res = ieee80211_check_queues(sdata,
	598	+ ieee80211_vif_type_p2p(&sdata->vif));
596	599	if (res)
597	600	goto err_del_interface;
598	601	}
599	602
...	...	@@ -1389,14 +1392,14 @@
1389	1392
1390	1393	ret = drv_change_interface(local, sdata, internal_type, p2p);
1391	1394	if (ret)
1392		- type = sdata->vif.type;
	1395	+ type = ieee80211_vif_type_p2p(&sdata->vif);
1393	1396
1394	1397	/*
1395	1398	* Ignore return value here, there's not much we can do since
1396	1399	* the driver changed the interface type internally already.
1397	1400	* The warnings will hopefully make driver authors fix it :-)
1398	1401	*/
1399		- ieee80211_check_queues(sdata);
	1402	+ ieee80211_check_queues(sdata, type);
1400	1403
1401	1404	ieee80211_setup_sdata(sdata, type);
1402	1405
...	...	@@ -892,9 +892,6 @@
892	892	if (!local->ops->remain_on_channel)
893	893	local->hw.wiphy->max_remain_on_channel_duration = 5000;
894	894
895		- if (local->ops->sched_scan_start)
896		- local->hw.wiphy->flags \|= WIPHY_FLAG_SUPPORTS_SCHED_SCAN;
897		-
898	895	/* mac80211 based drivers don't support internal TDLS setup */
899	896	if (local->hw.wiphy->flags & WIPHY_FLAG_SUPPORTS_TDLS)
900	897	local->hw.wiphy->flags \|= WIPHY_FLAG_TDLS_EXTERNAL_SETUP;