From 664100510c22754f090e15b5efab2a776ee8243c Mon Sep 17 00:00:00 2001 From: YAMANE Toshiaki Date: Thu, 29 Nov 2012 22:36:07 +0900 Subject: [PATCH] --- yaml --- r: 353891 b: refs/heads/master c: 12f96662534cbf8578c02dfdf6657d2c430daff3 h: refs/heads/master i: 353889: adbf41819ea8d95c4b5c777e214f287260cd36fb 353887: a8b8fd5698e971a05a8a64e69ea5d5878c5f1c2a v: v3 --- [refs] | 2 +- trunk/drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index c06010abfef8..9048ea50d82d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 76e5f2f85dcf01bfd9f11475174d5496534ff75c +refs/heads/master: 12f96662534cbf8578c02dfdf6657d2c430daff3 diff --git a/trunk/drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c b/trunk/drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c index 9d4608795dda..e014f7e74397 100644 --- a/trunk/drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c +++ b/trunk/drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c @@ -336,9 +336,8 @@ int ieee80211_wx_set_encode(struct ieee80211_device *ieee, kfree(new_crypt); new_crypt = NULL; - printk(KERN_WARNING "%s: could not initialize WEP: " - "load module ieee80211_crypt_wep\n", - dev->name); + netdev_warn(ieee->dev, + "could not initialize WEP: load module ieee80211_crypt_wep\n"); return -EOPNOTSUPP; } *crypt = new_crypt; @@ -410,7 +409,7 @@ int ieee80211_wx_set_encode(struct ieee80211_device *ieee, if (ieee->reset_on_keychange && ieee->iw_mode != IW_MODE_INFRA && ieee->reset_port && ieee->reset_port(dev)) { - printk(KERN_DEBUG "%s: reset_port failed\n", dev->name); + netdev_dbg(ieee->dev, "reset_port failed\n"); return -EINVAL; } return 0;