diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-06-26 14:27:34 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-06-26 14:27:34 -0400 |
| commit | 2c443443e715fc79da9b7c3e4f31a71fcf315b09 (patch) | |
| tree | 5b73cea04b13c888d94e29000c0a66ed2c23980f /net/mac80211/key.c | |
| parent | 5ea276963eacbef742fe4854883c0f69c903fcfd (diff) | |
| parent | 371a255e863857f988a91a3850d6feeaa4f3c536 (diff) | |
Merge branch 'for-john' of git://git.sipsolutions.net/mac80211-next
Diffstat (limited to 'net/mac80211/key.c')
| -rw-r--r-- | net/mac80211/key.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/key.c b/net/mac80211/key.c index 5bb600d93d7..b3b7e526e24 100644 --- a/net/mac80211/key.c +++ b/net/mac80211/key.c @@ -139,7 +139,7 @@ static int ieee80211_key_enable_hw_accel(struct ieee80211_key *key) } if (ret != -ENOSPC && ret != -EOPNOTSUPP) - wiphy_err(key->local->hw.wiphy, + sdata_err(sdata, "failed to set key (%d, %pM) to hardware (%d)\n", key->conf.keyidx, sta ? sta->sta.addr : bcast_addr, ret); @@ -186,7 +186,7 @@ static void ieee80211_key_disable_hw_accel(struct ieee80211_key *key) sta ? &sta->sta : NULL, &key->conf); if (ret) - wiphy_err(key->local->hw.wiphy, + sdata_err(sdata, "failed to remove key (%d, %pM) from hardware (%d)\n", key->conf.keyidx, sta ? sta->sta.addr : bcast_addr, ret); |