diff options
Diffstat (limited to 'net/mac80211/cfg.c')
-rw-r--r-- | net/mac80211/cfg.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 082f270b5912..8184d121ff09 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c | |||
@@ -2827,7 +2827,8 @@ static int ieee80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev, | |||
2827 | !rcu_access_pointer(sdata->bss->beacon)) | 2827 | !rcu_access_pointer(sdata->bss->beacon)) |
2828 | need_offchan = true; | 2828 | need_offchan = true; |
2829 | if (!ieee80211_is_action(mgmt->frame_control) || | 2829 | if (!ieee80211_is_action(mgmt->frame_control) || |
2830 | mgmt->u.action.category == WLAN_CATEGORY_PUBLIC) | 2830 | mgmt->u.action.category == WLAN_CATEGORY_PUBLIC || |
2831 | mgmt->u.action.category == WLAN_CATEGORY_SELF_PROTECTED) | ||
2831 | break; | 2832 | break; |
2832 | rcu_read_lock(); | 2833 | rcu_read_lock(); |
2833 | sta = sta_info_get(sdata, mgmt->da); | 2834 | sta = sta_info_get(sdata, mgmt->da); |
@@ -2930,19 +2931,8 @@ static void ieee80211_mgmt_frame_register(struct wiphy *wiphy, | |||
2930 | u16 frame_type, bool reg) | 2931 | u16 frame_type, bool reg) |
2931 | { | 2932 | { |
2932 | struct ieee80211_local *local = wiphy_priv(wiphy); | 2933 | struct ieee80211_local *local = wiphy_priv(wiphy); |
2933 | struct ieee80211_sub_if_data *sdata = IEEE80211_WDEV_TO_SUB_IF(wdev); | ||
2934 | 2934 | ||
2935 | switch (frame_type) { | 2935 | switch (frame_type) { |
2936 | case IEEE80211_FTYPE_MGMT | IEEE80211_STYPE_AUTH: | ||
2937 | if (sdata->vif.type == NL80211_IFTYPE_ADHOC) { | ||
2938 | struct ieee80211_if_ibss *ifibss = &sdata->u.ibss; | ||
2939 | |||
2940 | if (reg) | ||
2941 | ifibss->auth_frame_registrations++; | ||
2942 | else | ||
2943 | ifibss->auth_frame_registrations--; | ||
2944 | } | ||
2945 | break; | ||
2946 | case IEEE80211_FTYPE_MGMT | IEEE80211_STYPE_PROBE_REQ: | 2936 | case IEEE80211_FTYPE_MGMT | IEEE80211_STYPE_PROBE_REQ: |
2947 | if (reg) | 2937 | if (reg) |
2948 | local->probe_req_reg++; | 2938 | local->probe_req_reg++; |