diff options
Diffstat (limited to 'drivers/net/wireless/p54/p54common.c')
-rw-r--r-- | drivers/net/wireless/p54/p54common.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/p54/p54common.c b/drivers/net/wireless/p54/p54common.c index 8d2df5b6ecbf..0907e6f246e6 100644 --- a/drivers/net/wireless/p54/p54common.c +++ b/drivers/net/wireless/p54/p54common.c | |||
@@ -2127,7 +2127,7 @@ static void p54_bss_info_changed(struct ieee80211_hw *dev, | |||
2127 | } | 2127 | } |
2128 | 2128 | ||
2129 | static int p54_set_key(struct ieee80211_hw *dev, enum set_key_cmd cmd, | 2129 | static int p54_set_key(struct ieee80211_hw *dev, enum set_key_cmd cmd, |
2130 | const u8 *local_address, const u8 *address, | 2130 | struct ieee80211_vif *vif, struct ieee80211_sta *sta, |
2131 | struct ieee80211_key_conf *key) | 2131 | struct ieee80211_key_conf *key) |
2132 | { | 2132 | { |
2133 | struct p54_common *priv = dev->priv; | 2133 | struct p54_common *priv = dev->priv; |
@@ -2191,8 +2191,8 @@ static int p54_set_key(struct ieee80211_hw *dev, enum set_key_cmd cmd, | |||
2191 | rxkey->entry = key->keyidx; | 2191 | rxkey->entry = key->keyidx; |
2192 | rxkey->key_id = key->keyidx; | 2192 | rxkey->key_id = key->keyidx; |
2193 | rxkey->key_type = algo; | 2193 | rxkey->key_type = algo; |
2194 | if (address) | 2194 | if (sta) |
2195 | memcpy(rxkey->mac, address, ETH_ALEN); | 2195 | memcpy(rxkey->mac, sta->addr, ETH_ALEN); |
2196 | else | 2196 | else |
2197 | memset(rxkey->mac, ~0, ETH_ALEN); | 2197 | memset(rxkey->mac, ~0, ETH_ALEN); |
2198 | if (key->alg != ALG_TKIP) { | 2198 | if (key->alg != ALG_TKIP) { |