diff options
Diffstat (limited to 'net/mac80211/key.c')
-rw-r--r-- | net/mac80211/key.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/net/mac80211/key.c b/net/mac80211/key.c index dd6fc4aa3ff5..c10e53afbb4f 100644 --- a/net/mac80211/key.c +++ b/net/mac80211/key.c | |||
@@ -63,6 +63,7 @@ static void ieee80211_key_enable_hw_accel(struct ieee80211_key *key) | |||
63 | { | 63 | { |
64 | const u8 *addr; | 64 | const u8 *addr; |
65 | int ret; | 65 | int ret; |
66 | DECLARE_MAC_BUF(mac); | ||
66 | 67 | ||
67 | if (!key->local->ops->set_key) | 68 | if (!key->local->ops->set_key) |
68 | return; | 69 | return; |
@@ -78,15 +79,16 @@ static void ieee80211_key_enable_hw_accel(struct ieee80211_key *key) | |||
78 | 79 | ||
79 | if (ret && ret != -ENOSPC && ret != -EOPNOTSUPP) | 80 | if (ret && ret != -ENOSPC && ret != -EOPNOTSUPP) |
80 | printk(KERN_ERR "mac80211-%s: failed to set key " | 81 | printk(KERN_ERR "mac80211-%s: failed to set key " |
81 | "(%d, " MAC_FMT ") to hardware (%d)\n", | 82 | "(%d, %s) to hardware (%d)\n", |
82 | wiphy_name(key->local->hw.wiphy), | 83 | wiphy_name(key->local->hw.wiphy), |
83 | key->conf.keyidx, MAC_ARG(addr), ret); | 84 | key->conf.keyidx, print_mac(mac, addr), ret); |
84 | } | 85 | } |
85 | 86 | ||
86 | static void ieee80211_key_disable_hw_accel(struct ieee80211_key *key) | 87 | static void ieee80211_key_disable_hw_accel(struct ieee80211_key *key) |
87 | { | 88 | { |
88 | const u8 *addr; | 89 | const u8 *addr; |
89 | int ret; | 90 | int ret; |
91 | DECLARE_MAC_BUF(mac); | ||
90 | 92 | ||
91 | if (!key->local->ops->set_key) | 93 | if (!key->local->ops->set_key) |
92 | return; | 94 | return; |
@@ -102,9 +104,9 @@ static void ieee80211_key_disable_hw_accel(struct ieee80211_key *key) | |||
102 | 104 | ||
103 | if (ret) | 105 | if (ret) |
104 | printk(KERN_ERR "mac80211-%s: failed to remove key " | 106 | printk(KERN_ERR "mac80211-%s: failed to remove key " |
105 | "(%d, " MAC_FMT ") from hardware (%d)\n", | 107 | "(%d, %s) from hardware (%d)\n", |
106 | wiphy_name(key->local->hw.wiphy), | 108 | wiphy_name(key->local->hw.wiphy), |
107 | key->conf.keyidx, MAC_ARG(addr), ret); | 109 | key->conf.keyidx, print_mac(mac, addr), ret); |
108 | 110 | ||
109 | key->flags &= ~KEY_FLAG_UPLOADED_TO_HARDWARE; | 111 | key->flags &= ~KEY_FLAG_UPLOADED_TO_HARDWARE; |
110 | } | 112 | } |