From 597e8fe62ad8af38e5b7a67ae37922161596b975 Mon Sep 17 00:00:00 2001
From: Devendra Naga <devendra.aaru@gmail.com>
Date: Thu, 13 Sep 2012 15:00:30 +0530
Subject: [PATCH] --- yaml --- r: 325268 b: refs/heads/master c:
 3f45932720b7d4e1d409b3cc5cbc0bf18d67553b h: refs/heads/master v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/staging/wlan-ng/p80211netdev.c | 6 +-----
 trunk/drivers/staging/wlan-ng/p80211netdev.h | 2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 420a9e548ba2..6d3fdd3d15c8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d04600679ba08f40f5a3be597f44250b129af552
+refs/heads/master: 3f45932720b7d4e1d409b3cc5cbc0bf18d67553b
diff --git a/trunk/drivers/staging/wlan-ng/p80211netdev.c b/trunk/drivers/staging/wlan-ng/p80211netdev.c
index 8afb1935e3fb..6ca07e7df406 100644
--- a/trunk/drivers/staging/wlan-ng/p80211netdev.c
+++ b/trunk/drivers/staging/wlan-ng/p80211netdev.c
@@ -803,15 +803,13 @@ int wlan_setup(wlandevice_t *wlandev, struct device *physdev)
 * Arguments:
 *	wlandev		ptr to the wlandev structure for the
 *			interface.
-* Returns:
-*	zero on success, non-zero otherwise.
 * Call Context:
 *	Should be process thread.  We'll assume it might be
 *	interrupt though.  When we add support for statically
 *	compiled drivers, this function will be called in the
 *	context of the kernel startup code.
 ----------------------------------------------------------------*/
-int wlan_unsetup(wlandevice_t *wlandev)
+void wlan_unsetup(wlandevice_t *wlandev)
 {
 	struct wireless_dev *wdev;
 
@@ -824,8 +822,6 @@ int wlan_unsetup(wlandevice_t *wlandev)
 		free_netdev(wlandev->netdev);
 		wlandev->netdev = NULL;
 	}
-
-	return 0;
 }
 
 /*----------------------------------------------------------------
diff --git a/trunk/drivers/staging/wlan-ng/p80211netdev.h b/trunk/drivers/staging/wlan-ng/p80211netdev.h
index 85884176b661..2fecca2302f4 100644
--- a/trunk/drivers/staging/wlan-ng/p80211netdev.h
+++ b/trunk/drivers/staging/wlan-ng/p80211netdev.h
@@ -235,7 +235,7 @@ int wep_encrypt(wlandevice_t *wlandev, u8 *buf, u8 *dst, u32 len, int keynum,
 		u8 *iv, u8 *icv);
 
 int wlan_setup(wlandevice_t *wlandev, struct device *physdev);
-int wlan_unsetup(wlandevice_t *wlandev);
+void wlan_unsetup(wlandevice_t *wlandev);
 int register_wlandev(wlandevice_t *wlandev);
 int unregister_wlandev(wlandevice_t *wlandev);
 void p80211netdev_rx(wlandevice_t *wlandev, struct sk_buff *skb);