hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
John W. Linville 2012-09-07 14:49:46 -04:00
parent a4881cc45a 768be59f30
commit 4a3e12fd7a
6 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/net/cfg80211.h
View File

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

2
net/mac80211/iface.c
View File

@ -278,6 +278,7 @@ static int ieee80211_check_queues(struct ieee80211_sub_if_data *sdata)
int n_queues = sdata->local->hw.queues; int n_queues = sdata->local->hw.queues;
int i; int i;
if (sdata->vif.type != NL80211_IFTYPE_P2P_DEVICE) {
for (i = 0; i < IEEE80211_NUM_ACS; i++) { for (i = 0; i < IEEE80211_NUM_ACS; i++) {
if (WARN_ON_ONCE(sdata->vif.hw_queue[i] == if (WARN_ON_ONCE(sdata->vif.hw_queue[i] ==
IEEE80211_INVAL_HW_QUEUE)) IEEE80211_INVAL_HW_QUEUE))
@ -286,6 +287,7 @@ static int ieee80211_check_queues(struct ieee80211_sub_if_data *sdata)
n_queues)) n_queues))
return -EINVAL; return -EINVAL;
} }
}
if ((sdata->vif.type != NL80211_IFTYPE_AP) || if ((sdata->vif.type != NL80211_IFTYPE_AP) ||
!(sdata->local->hw.flags & IEEE80211_HW_QUEUE_CONTROL)) { !(sdata->local->hw.flags & IEEE80211_HW_QUEUE_CONTROL)) {

2
net/mac80211/rx.c
View File

@ -103,7 +103,7 @@ ieee80211_rx_radiotap_len(struct ieee80211_local *local,
return len; return len;
} }
/** /*
* ieee80211_add_rx_radiotap_header - add radiotap header * ieee80211_add_rx_radiotap_header - add radiotap header
* *
* add a radiotap header containing all the fields which the hardware provided. * add a radiotap header containing all the fields which the hardware provided.

6
net/wireless/reg.c
View File

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

8
net/wireless/wext-core.c
View File

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