Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next (4a3e12fd) · Commits · 戴 / test

include/net/cfg80211.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -243,6 +243,7 @@ struct ieee80211_sta_vht_cap {
		* rates" IE, i.e. CCK rates first, then OFDM.
		* @n_bitrates: Number of bitrates in @bitrates
		* @ht_cap: HT capabilities in this band
		* @vht_cap: VHT capabilities in this band
		*/
		struct ieee80211_supported_band {
		struct ieee80211_channel *channels;

+9 −7

Original line number	Diff line number	Diff line
		@@ -278,6 +278,7 @@ static int ieee80211_check_queues(struct ieee80211_sub_if_data *sdata)
		int n_queues = sdata->local->hw.queues;
		int i;

		if (sdata->vif.type != 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))
		@@ -286,6 +287,7 @@ static int ieee80211_check_queues(struct ieee80211_sub_if_data *sdata)
		n_queues))
		return -EINVAL;
		}
		}

		if ((sdata->vif.type != NL80211_IFTYPE_AP) \|\|
		!(sdata->local->hw.flags & IEEE80211_HW_QUEUE_CONTROL)) {

+1 −1

Original line number	Diff line number	Diff line
		@@ -103,7 +103,7 @@ ieee80211_rx_radiotap_len(struct ieee80211_local *local,
		return len;
		}

		/**
		/*
		* ieee80211_add_rx_radiotap_header - add radiotap header
		*
		* add a radiotap header containing all the fields which the hardware provided.

+2 −4

Original line number	Diff line number	Diff line
		@@ -1932,8 +1932,7 @@ static void restore_regulatory_settings(bool reset_user)
		if (reg_request->initiator !=
		NL80211_REGDOM_SET_BY_USER)
		continue;
		list_del(&reg_request->list);
		list_add_tail(&reg_request->list, &tmp_reg_req_list);
		list_move_tail(&reg_request->list, &tmp_reg_req_list);
		}
		}
		spin_unlock(&reg_requests_lock);
		@@ -1992,8 +1991,7 @@ static void restore_regulatory_settings(bool reset_user)
		"into the queue\n",
		reg_request->alpha2[0],
		reg_request->alpha2[1]);
		list_del(&reg_request->list);
		list_add_tail(&reg_request->list, &reg_requests_list);
		list_move_tail(&reg_request->list, &reg_requests_list);
		}
		spin_unlock(&reg_requests_lock);

+4 −4

Original line number	Diff line number	Diff line
		@@ -478,13 +478,13 @@ void wireless_send_event(struct net_device * dev,
		if (descr->header_type == IW_HEADER_TYPE_POINT) {
		/* Check if number of token fits within bounds */
		if (wrqu->data.length > descr->max_tokens) {
		netdev_err(dev, "(WE) : Wireless Event too big (%d)\n",
		wrqu->data.length);
		netdev_err(dev, "(WE) : Wireless Event (cmd=0x%04X) too big (%d)\n",
		cmd, wrqu->data.length);
		return;
		}
		if (wrqu->data.length < descr->min_tokens) {
		netdev_err(dev, "(WE) : Wireless Event too small (%d)\n",
		wrqu->data.length);
		netdev_err(dev, "(WE) : Wireless Event (cmd=0x%04X) too small (%d)\n",
		cmd, wrqu->data.length);
		return;
		}
		/* Calculate extra_len - extra is NULL for restricted events */

+1 −1

File changed.

Contains only whitespace changes.