diff options
Diffstat (limited to 'drivers/staging/wlan-ng/p80211conv.c')
-rw-r--r-- | drivers/staging/wlan-ng/p80211conv.c | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/drivers/staging/wlan-ng/p80211conv.c b/drivers/staging/wlan-ng/p80211conv.c index c1b1afacadb..b2d6ae53cab 100644 --- a/drivers/staging/wlan-ng/p80211conv.c +++ b/drivers/staging/wlan-ng/p80211conv.c | |||
@@ -83,27 +83,12 @@ | |||
83 | 83 | ||
84 | 84 | ||
85 | /*================================================================*/ | 85 | /*================================================================*/ |
86 | /* Local Constants */ | ||
87 | |||
88 | /*================================================================*/ | ||
89 | /* Local Macros */ | ||
90 | |||
91 | |||
92 | /*================================================================*/ | ||
93 | /* Local Types */ | ||
94 | |||
95 | |||
96 | /*================================================================*/ | ||
97 | /* Local Static Definitions */ | 86 | /* Local Static Definitions */ |
98 | 87 | ||
99 | static u8 oui_rfc1042[] = {0x00, 0x00, 0x00}; | 88 | static u8 oui_rfc1042[] = {0x00, 0x00, 0x00}; |
100 | static u8 oui_8021h[] = {0x00, 0x00, 0xf8}; | 89 | static u8 oui_8021h[] = {0x00, 0x00, 0xf8}; |
101 | 90 | ||
102 | /*================================================================*/ | 91 | /*================================================================*/ |
103 | /* Local Function Declarations */ | ||
104 | |||
105 | |||
106 | /*================================================================*/ | ||
107 | /* Function Definitions */ | 92 | /* Function Definitions */ |
108 | 93 | ||
109 | /*---------------------------------------------------------------- | 94 | /*---------------------------------------------------------------- |
@@ -225,11 +210,7 @@ int skb_ether_to_p80211( wlandevice_t *wlandev, u32 ethconv, struct sk_buff *skb | |||
225 | if ((wlandev->hostwep & HOSTWEP_PRIVACYINVOKED) && (wlandev->hostwep & HOSTWEP_ENCRYPT)) { | 210 | if ((wlandev->hostwep & HOSTWEP_PRIVACYINVOKED) && (wlandev->hostwep & HOSTWEP_ENCRYPT)) { |
226 | // XXXX need to pick keynum other than default? | 211 | // XXXX need to pick keynum other than default? |
227 | 212 | ||
228 | #if 1 | ||
229 | p80211_wep->data = kmalloc(skb->len, GFP_ATOMIC); | 213 | p80211_wep->data = kmalloc(skb->len, GFP_ATOMIC); |
230 | #else | ||
231 | p80211_wep->data = skb->data; | ||
232 | #endif | ||
233 | 214 | ||
234 | if ((foo = wep_encrypt(wlandev, skb->data, p80211_wep->data, | 215 | if ((foo = wep_encrypt(wlandev, skb->data, p80211_wep->data, |
235 | skb->len, | 216 | skb->len, |