diff options
author | Joe Perches <joe@perches.com> | 2010-11-16 22:56:49 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-11-24 16:19:33 -0500 |
commit | e9c0268f02f8970149158a9b7ea1e5c1c45c819d (patch) | |
tree | 1c73aeb5aa981379545a0b1edbd13dc6cbea6fee /net/wireless/util.c | |
parent | d7a066c92394f3e777351de0c903beeb8a08af76 (diff) |
net/wireless: Use pr_<level> and netdev_<level>
No change in output for pr_<level> prefixes.
netdev_<level> output is different, arguably improved.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/wireless/util.c')
-rw-r--r-- | net/wireless/util.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/net/wireless/util.c b/net/wireless/util.c index 76120aeda57d..fee020b15a4e 100644 --- a/net/wireless/util.c +++ b/net/wireless/util.c | |||
@@ -502,7 +502,7 @@ int ieee80211_data_from_8023(struct sk_buff *skb, const u8 *addr, | |||
502 | skb_orphan(skb); | 502 | skb_orphan(skb); |
503 | 503 | ||
504 | if (pskb_expand_head(skb, head_need, 0, GFP_ATOMIC)) { | 504 | if (pskb_expand_head(skb, head_need, 0, GFP_ATOMIC)) { |
505 | printk(KERN_ERR "failed to reallocate Tx buffer\n"); | 505 | pr_err("failed to reallocate Tx buffer\n"); |
506 | return -ENOMEM; | 506 | return -ENOMEM; |
507 | } | 507 | } |
508 | skb->truesize += head_need; | 508 | skb->truesize += head_need; |
@@ -685,20 +685,17 @@ void cfg80211_upload_connect_keys(struct wireless_dev *wdev) | |||
685 | continue; | 685 | continue; |
686 | if (rdev->ops->add_key(wdev->wiphy, dev, i, false, NULL, | 686 | if (rdev->ops->add_key(wdev->wiphy, dev, i, false, NULL, |
687 | &wdev->connect_keys->params[i])) { | 687 | &wdev->connect_keys->params[i])) { |
688 | printk(KERN_ERR "%s: failed to set key %d\n", | 688 | netdev_err(dev, "failed to set key %d\n", i); |
689 | dev->name, i); | ||
690 | continue; | 689 | continue; |
691 | } | 690 | } |
692 | if (wdev->connect_keys->def == i) | 691 | if (wdev->connect_keys->def == i) |
693 | if (rdev->ops->set_default_key(wdev->wiphy, dev, i)) { | 692 | if (rdev->ops->set_default_key(wdev->wiphy, dev, i)) { |
694 | printk(KERN_ERR "%s: failed to set defkey %d\n", | 693 | netdev_err(dev, "failed to set defkey %d\n", i); |
695 | dev->name, i); | ||
696 | continue; | 694 | continue; |
697 | } | 695 | } |
698 | if (wdev->connect_keys->defmgmt == i) | 696 | if (wdev->connect_keys->defmgmt == i) |
699 | if (rdev->ops->set_default_mgmt_key(wdev->wiphy, dev, i)) | 697 | if (rdev->ops->set_default_mgmt_key(wdev->wiphy, dev, i)) |
700 | printk(KERN_ERR "%s: failed to set mgtdef %d\n", | 698 | netdev_err(dev, "failed to set mgtdef %d\n", i); |
701 | dev->name, i); | ||
702 | } | 699 | } |
703 | 700 | ||
704 | kfree(wdev->connect_keys); | 701 | kfree(wdev->connect_keys); |