Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma

[deliverable/linux.git] / drivers / staging / wlan-ng / p80211req.c

diff --git a/drivers/staging/wlan-ng/p80211req.c b/drivers/staging/wlan-ng/p80211req.c
index cdfd808d6854bf2a81d14794914d869cabcfa9f1..7221379c9742532f79d6c75090be7e0d27fe51eb 100644 (file)
--- a/drivers/staging/wlan-ng/p80211req.c
+++ b/drivers/staging/wlan-ng/p80211req.c
@@ -95,7 +95,6 @@ static void p80211req_mibset_mibget(wlandevice_t *wlandev,
 ----------------------------------------------------------------*/
 int p80211req_dorequest(wlandevice_t *wlandev, u8 *msgbuf)
 {
-       int result = 0;
        struct p80211msg *msg = (struct p80211msg *) msgbuf;
 
        /* Check to make sure the MSD is running */
@@ -109,9 +108,9 @@ int p80211req_dorequest(wlandevice_t *wlandev, u8 *msgbuf)
        /* Check Permissions */
        if (!capable(CAP_NET_ADMIN) &&
        (msg->msgcode != DIDmsg_dot11req_mibget)) {
-               printk(KERN_ERR
-                      "%s: only dot11req_mibget allowed for non-root.\n",
-                      wlandev->name);
+               netdev_err(wlandev->netdev,
+                          "%s: only dot11req_mibget allowed for non-root.\n",
+                          wlandev->name);
                return -EPERM;
        }
 
@@ -129,7 +128,7 @@ int p80211req_dorequest(wlandevice_t *wlandev, u8 *msgbuf)
                wlandev->mlmerequest(wlandev, msg);
 
        clear_bit(1, &(wlandev->request_pending));
-       return result;  /* if result==0, msg->status still may contain an err */
+       return 0;       /* if result==0, msg->status still may contain an err */
 }
 
 /*----------------------------------------------------------------