diff options
author | David S. Miller <davem@davemloft.net> | 2016-09-23 06:46:57 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-09-23 06:46:57 -0400 |
commit | d6989d4bbe6c4d1c2a76696833a07f044e85694d (patch) | |
tree | 2d9a70d0feee4d4a20568be1b39a961fa0d27d81 /net/wireless | |
parent | 0364a8824c020f12e2d5e9fad963685b58f7574e (diff) | |
parent | b1f2beb87bb034bb209773807994279f90cace78 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/wireless')
-rw-r--r-- | net/wireless/nl80211.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 887c4c114206..fd111e2b559d 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c | |||
@@ -7014,7 +7014,7 @@ static int nl80211_channel_switch(struct sk_buff *skb, struct genl_info *info) | |||
7014 | 7014 | ||
7015 | params.n_counter_offsets_presp = len / sizeof(u16); | 7015 | params.n_counter_offsets_presp = len / sizeof(u16); |
7016 | if (rdev->wiphy.max_num_csa_counters && | 7016 | if (rdev->wiphy.max_num_csa_counters && |
7017 | (params.n_counter_offsets_beacon > | 7017 | (params.n_counter_offsets_presp > |
7018 | rdev->wiphy.max_num_csa_counters)) | 7018 | rdev->wiphy.max_num_csa_counters)) |
7019 | return -EINVAL; | 7019 | return -EINVAL; |
7020 | 7020 | ||