summaryrefslogtreecommitdiff
path: root/drivers/staging/wlan-ng/p80211conv.c
diff options
context:
space:
mode:
authorMoritz Muehlenhoff <jmm@debian.org>2009-01-25 21:55:09 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2009-04-03 14:53:18 -0700
commit944be922b7213fb844076051e99c2acae3c73676 (patch)
tree7a55dabe6eebb213127bea59fa88818a170599e6 /drivers/staging/wlan-ng/p80211conv.c
parentc63ef0717ae5bdb7687edeaae41e95dba3d6b87f (diff)
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>
Diffstat (limited to 'drivers/staging/wlan-ng/p80211conv.c')
-rw-r--r--drivers/staging/wlan-ng/p80211conv.c19
1 files changed, 0 insertions, 19 deletions
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
@@ -83,27 +83,12 @@
/*================================================================*/
-/* 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,