diff options
| author | Tova Mussai <tova.mussai@intel.com> | 2017-10-29 11:51:11 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2017-12-11 12:19:21 +0100 |
| commit | 9ae3b172e886c851d8cd6a88569025160b485e95 (patch) | |
| tree | 70c4bccd947b580e041ee115835647d6c64b5240 | |
| parent | c7976f5272486e4ff406014c4b43e2fa3b70b052 (diff) | |
| download | op-kernel-dev-9ae3b172e886c851d8cd6a88569025160b485e95.zip op-kernel-dev-9ae3b172e886c851d8cd6a88569025160b485e95.tar.gz | |
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>
| -rw-r--r-- | include/net/cfg80211.h | 5 | ||||
| -rw-r--r-- | net/wireless/ibss.c | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index 8b8118a..698cebf 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h @@ -2021,6 +2021,9 @@ struct cfg80211_disassoc_request { * @ht_capa: HT Capabilities over-rides. Values set in ht_capa_mask * will be used in ht_capa. Un-supported values will be ignored. * @ht_capa_mask: The bits of ht_capa which are to be used. + * @wep_keys: static WEP keys, if not NULL points to an array of + * CFG80211_MAX_WEP_KEYS WEP keys + * @wep_tx_key: key index (0..3) of the default TX static WEP key */ struct cfg80211_ibss_params { const u8 *ssid; @@ -2037,6 +2040,8 @@ struct cfg80211_ibss_params { int mcast_rate[NUM_NL80211_BANDS]; struct ieee80211_ht_cap ht_capa; struct ieee80211_ht_cap ht_capa_mask; + struct key_params *wep_keys; + int wep_tx_key; }; /** diff --git a/net/wireless/ibss.c b/net/wireless/ibss.c index 413d4f4..a1d1099 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 |
