summaryrefslogtreecommitdiff
path: root/net/mac80211/key.c
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2010-08-20 16:25:38 -0700
committerJohn W. Linville <linville@tuxdriver.com>2010-08-25 14:33:17 -0400
commit0fb9a9ec27718fbf7fa3153bc94becefb716ceeb (patch)
tree8f5d6a5fa9f2c6b8b08273dc198d6187d0a70361 /net/mac80211/key.c
parentb62177a0aa0521fd07cd7501534c0c3b256ebce6 (diff)
downloadlinux-stable-0fb9a9ec27718fbf7fa3153bc94becefb716ceeb.tar.gz
linux-stable-0fb9a9ec27718fbf7fa3153bc94becefb716ceeb.tar.bz2
linux-stable-0fb9a9ec27718fbf7fa3153bc94becefb716ceeb.zip
net/mac80211: Use wiphy_<level>
Standardize logging messages from printk(KERN_<level> "%s: " fmt , wiphy_name(foo), args); to wiphy_<level>(foo, fmt, args); Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/key.c')
-rw-r--r--net/mac80211/key.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/net/mac80211/key.c b/net/mac80211/key.c
index 9c27c53cfae5..2ce2dbbf6309 100644
--- a/net/mac80211/key.c
+++ b/net/mac80211/key.c
@@ -87,10 +87,9 @@ static void ieee80211_key_enable_hw_accel(struct ieee80211_key *key)
key->flags |= KEY_FLAG_UPLOADED_TO_HARDWARE;
if (ret && ret != -ENOSPC && ret != -EOPNOTSUPP)
- printk(KERN_ERR "mac80211-%s: failed to set key "
- "(%d, %pM) to hardware (%d)\n",
- wiphy_name(key->local->hw.wiphy),
- key->conf.keyidx, sta ? sta->addr : bcast_addr, ret);
+ wiphy_err(key->local->hw.wiphy,
+ "failed to set key (%d, %pM) to hardware (%d)\n",
+ key->conf.keyidx, sta ? sta->addr : bcast_addr, ret);
}
static void ieee80211_key_disable_hw_accel(struct ieee80211_key *key)
@@ -121,10 +120,9 @@ static void ieee80211_key_disable_hw_accel(struct ieee80211_key *key)
sta, &key->conf);
if (ret)
- printk(KERN_ERR "mac80211-%s: failed to remove key "
- "(%d, %pM) from hardware (%d)\n",
- wiphy_name(key->local->hw.wiphy),
- key->conf.keyidx, sta ? sta->addr : bcast_addr, ret);
+ wiphy_err(key->local->hw.wiphy,
+ "failed to remove key (%d, %pM) from hardware (%d)\n",
+ key->conf.keyidx, sta ? sta->addr : bcast_addr, ret);
key->flags &= ~KEY_FLAG_UPLOADED_TO_HARDWARE;
}