diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-04-26 15:03:48 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-04-26 15:03:48 -0400 |
| commit | d9b8ae6bd8c3304569a25079fcdbebaa28a48ee4 (patch) | |
| tree | 9ce3e4eb355685f970dd7333a0a935109aff0583 /net/wireless | |
| parent | 872f24dbc604ef585ea7eec73020dcdfaffd1956 (diff) | |
| parent | 94c514fe240fc0dd02187b78facefde8b6744634 (diff) | |
| download | linux-3.10-d9b8ae6bd8c3304569a25079fcdbebaa28a48ee4.tar.gz linux-3.10-d9b8ae6bd8c3304569a25079fcdbebaa28a48ee4.tar.bz2 linux-3.10-d9b8ae6bd8c3304569a25079fcdbebaa28a48ee4.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
drivers/net/wireless/iwlwifi/iwl-testmode.c
Diffstat (limited to 'net/wireless')
| -rw-r--r-- | net/wireless/nl80211.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 83d71d6b63a..d5005c59c47 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -5656,6 +5656,9 @@ static int nl80211_set_tx_bitrate_mask(struct sk_buff *skb, sband, nla_data(tb[NL80211_TXRATE_LEGACY]), nla_len(tb[NL80211_TXRATE_LEGACY])); + if ((mask.control[band].legacy == 0) && + nla_len(tb[NL80211_TXRATE_LEGACY])) + return -EINVAL; } if (tb[NL80211_TXRATE_MCS]) { if (!ht_rateset_to_mask( |