diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-07-22 17:49:34 (GMT) |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-07-22 17:49:34 (GMT) |
| commit | a006827a152c3f4d09324157096c8f89cf7ddca3 (patch) | |
| tree | 3590601aa271f8def4ef6fdc701eb0004a05f925 /net/wireless/nl80211.c | |
| parent | 1d9e954e8b522ae37c7c0fdd791b5736321684a0 (diff) | |
| parent | 08cf42e843f9a7e253502011c81677f61f7e5c42 (diff) | |
| download | linux-a006827a152c3f4d09324157096c8f89cf7ddca3.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'net/wireless/nl80211.c')
| -rw-r--r-- | net/wireless/nl80211.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 082f5c6..df7b133 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -3814,7 +3814,8 @@ int cfg80211_check_station_change(struct wiphy *wiphy, { if (params->listen_interval != -1) return -EINVAL; - if (params->aid) + if (params->aid && + !(params->sta_flags_set & BIT(NL80211_STA_FLAG_TDLS_PEER))) return -EINVAL; /* When you run into this, adjust the code below for the new flag */ |