summaryrefslogtreecommitdiffstats
path: root/net/wireless/ibss.c
diff options
context:
space:
mode:
authorTova Mussai2017-10-29 10:51:11 +0100
committerJohannes Berg2017-12-11 12:19:21 +0100
commit9ae3b172e886c851d8cd6a88569025160b485e95 (patch)
tree70c4bccd947b580e041ee115835647d6c64b5240 /net/wireless/ibss.c
parentmac80211: remove BUG() when interface type is invalid (diff)
downloadkernel-qcow2-linux-9ae3b172e886c851d8cd6a88569025160b485e95.tar.gz
kernel-qcow2-linux-9ae3b172e886c851d8cd6a88569025160b485e95.tar.xz
kernel-qcow2-linux-9ae3b172e886c851d8cd6a88569025160b485e95.zip
cfg80211: IBSS: Add support for static WEP in driver for IBSS
Add support for drivers that implement static WEP internally for IBSS. Add the WEP keys to the IBSS params struct, that will allow the driver to use the keys in the join flow, and not only after the connection. Signed-off-by: Tova Mussai <tova.mussai@intel.com> Signed-off-by: Luca Coelho <luciano.coelho@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless/ibss.c')
-rw-r--r--net/wireless/ibss.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/net/wireless/ibss.c b/net/wireless/ibss.c
index 413d4f4e6334..a1d10993d08a 100644
--- a/net/wireless/ibss.c
+++ b/net/wireless/ibss.c
@@ -126,6 +126,11 @@ static int __cfg80211_join_ibss(struct cfg80211_registered_device *rdev,
wdev->ibss_fixed = params->channel_fixed;
wdev->ibss_dfs_possible = params->userspace_handles_dfs;
wdev->chandef = params->chandef;
+ if (connkeys) {
+ params->wep_keys = connkeys->params;
+ params->wep_tx_key = connkeys->def;
+ }
+
#ifdef CONFIG_CFG80211_WEXT
wdev->wext.ibss.chandef = params->chandef;
#endif