提交 ff973af7 编写于 作者: T Thomas Pedersen 提交者: John W. Linville

nl80211: allow installing keys for a meshif

Signed-off-by: NThomas Pedersen <thomas@cozybit.com>
Signed-off-by: NJavier Cardona <javier@cozybit.com>
Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>
上级 9c3990aa
...@@ -136,7 +136,10 @@ static int ieee80211_add_key(struct wiphy *wiphy, struct net_device *dev, ...@@ -136,7 +136,10 @@ static int ieee80211_add_key(struct wiphy *wiphy, struct net_device *dev,
mutex_lock(&sdata->local->sta_mtx); mutex_lock(&sdata->local->sta_mtx);
if (mac_addr) { if (mac_addr) {
sta = sta_info_get_bss(sdata, mac_addr); if (ieee80211_vif_is_mesh(&sdata->vif))
sta = sta_info_get(sdata, mac_addr);
else
sta = sta_info_get_bss(sdata, mac_addr);
if (!sta) { if (!sta) {
ieee80211_key_free(sdata->local, key); ieee80211_key_free(sdata->local, key);
err = -ENOENT; err = -ENOENT;
......
...@@ -545,6 +545,7 @@ static int nl80211_key_allowed(struct wireless_dev *wdev) ...@@ -545,6 +545,7 @@ static int nl80211_key_allowed(struct wireless_dev *wdev)
case NL80211_IFTYPE_AP: case NL80211_IFTYPE_AP:
case NL80211_IFTYPE_AP_VLAN: case NL80211_IFTYPE_AP_VLAN:
case NL80211_IFTYPE_P2P_GO: case NL80211_IFTYPE_P2P_GO:
case NL80211_IFTYPE_MESH_POINT:
break; break;
case NL80211_IFTYPE_ADHOC: case NL80211_IFTYPE_ADHOC:
if (!wdev->current_bss) if (!wdev->current_bss)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册