From: Moritz Muehlenhoff <jmm@debian.org>
Date: Sun, 25 Jan 2009 20:55:09 +0000 (+0100)
Subject: Staging: wlan-ng: Remove dead/unused code from p80211conv.c
X-Git-Tag: firefly_0821_release~14777^2~611
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=944be922b7213fb844076051e99c2acae3c73676;p=firefly-linux-kernel-4.4.55.git

Staging: wlan-ng: Remove dead/unused code from p80211conv.c

Signed-off-by: Moritz Muehlenhoff <jmm@debian.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/staging/wlan-ng/p80211conv.c b/drivers/staging/wlan-ng/p80211conv.c
index c1b1afacadb4..b2d6ae53cab6 100644
--- a/drivers/staging/wlan-ng/p80211conv.c
+++ b/drivers/staging/wlan-ng/p80211conv.c
@@ -82,27 +82,12 @@
 #include "p80211req.h"
 
 
-/*================================================================*/
-/* Local Constants */
-
-/*================================================================*/
-/* Local Macros */
-
-
-/*================================================================*/
-/* Local Types */
-
-
 /*================================================================*/
 /* Local Static Definitions */
 
 static u8	oui_rfc1042[] = {0x00, 0x00, 0x00};
 static u8	oui_8021h[] = {0x00, 0x00, 0xf8};
 
-/*================================================================*/
-/* Local Function Declarations */
-
-
 /*================================================================*/
 /* Function Definitions */
 
@@ -225,11 +210,7 @@ int skb_ether_to_p80211( wlandevice_t *wlandev, u32 ethconv, struct sk_buff *skb
 	if ((wlandev->hostwep & HOSTWEP_PRIVACYINVOKED) && (wlandev->hostwep & HOSTWEP_ENCRYPT)) {
 		// XXXX need to pick keynum other than default?
 
-#if 1
 		p80211_wep->data = kmalloc(skb->len, GFP_ATOMIC);
-#else
-		p80211_wep->data = skb->data;
-#endif
 
 		if ((foo = wep_encrypt(wlandev, skb->data, p80211_wep->data,
 				       skb->len,