diff options
| author | David S. Miller <davem@davemloft.net> | 2017-01-17 21:19:37 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-01-17 21:19:37 +0100 |
| commit | 580bdf5650fff8f66468ce491f8308f1117b7074 (patch) | |
| tree | 3570ba1406f8cf492308d07cd88d3e53742a69f2 /net/wireless | |
| parent | Merge branch 'mpls-packet-stats' (diff) | |
| parent | stmmac: add missing of_node_put (diff) | |
| download | linux-580bdf5650fff8f66468ce491f8308f1117b7074.tar.xz linux-580bdf5650fff8f66468ce491f8308f1117b7074.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/wireless')
| -rw-r--r-- | net/wireless/nl80211.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index bed816cfd754..63dfa60a29ef 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -4620,6 +4620,15 @@ int cfg80211_check_station_change(struct wiphy *wiphy, break; } + /* + * Older kernel versions ignored this attribute entirely, so don't + * reject attempts to update it but mark it as unused instead so the + * driver won't look at the data. + */ + if (statype != CFG80211_STA_AP_CLIENT_UNASSOC && + statype != CFG80211_STA_TDLS_PEER_SETUP) + params->opmode_notif_used = false; + return 0; } EXPORT_SYMBOL(cfg80211_check_station_change); @@ -4859,6 +4868,12 @@ static int nl80211_set_station(struct sk_buff *skb, struct genl_info *info) params.local_pm = pm; } + if (info->attrs[NL80211_ATTR_OPMODE_NOTIF]) { + params.opmode_notif_used = true; + params.opmode_notif = + nla_get_u8(info->attrs[NL80211_ATTR_OPMODE_NOTIF]); + } + /* Include parameters for TDLS peer (will check later) */ err = nl80211_set_station_tdls(info, ¶ms); if (err) |