diff options
Diffstat (limited to 'net/mac80211/key.c')
| -rw-r--r-- | net/mac80211/key.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/mac80211/key.c b/net/mac80211/key.c index 6597c779e35a..57afcd38cd9e 100644 --- a/net/mac80211/key.c +++ b/net/mac80211/key.c | |||
| @@ -118,12 +118,12 @@ static const u8 *get_mac_for_key(struct ieee80211_key *key) | |||
| 118 | * address to indicate a transmit-only key. | 118 | * address to indicate a transmit-only key. |
| 119 | */ | 119 | */ |
| 120 | if (key->conf.alg != ALG_WEP && | 120 | if (key->conf.alg != ALG_WEP && |
| 121 | (key->sdata->vif.type == IEEE80211_IF_TYPE_AP || | 121 | (key->sdata->vif.type == NL80211_IFTYPE_AP || |
| 122 | key->sdata->vif.type == IEEE80211_IF_TYPE_VLAN)) | 122 | key->sdata->vif.type == NL80211_IFTYPE_AP_VLAN)) |
| 123 | addr = zero_addr; | 123 | addr = zero_addr; |
| 124 | 124 | ||
| 125 | if (key->sta) | 125 | if (key->sta) |
| 126 | addr = key->sta->addr; | 126 | addr = key->sta->sta.addr; |
| 127 | 127 | ||
| 128 | return addr; | 128 | return addr; |
| 129 | } | 129 | } |
| @@ -331,7 +331,7 @@ void ieee80211_key_link(struct ieee80211_key *key, | |||
| 331 | */ | 331 | */ |
| 332 | key->conf.flags |= IEEE80211_KEY_FLAG_PAIRWISE; | 332 | key->conf.flags |= IEEE80211_KEY_FLAG_PAIRWISE; |
| 333 | } else { | 333 | } else { |
| 334 | if (sdata->vif.type == IEEE80211_IF_TYPE_STA) { | 334 | if (sdata->vif.type == NL80211_IFTYPE_STATION) { |
| 335 | struct sta_info *ap; | 335 | struct sta_info *ap; |
| 336 | 336 | ||
| 337 | /* | 337 | /* |