diff --git a/[refs] b/[refs]
index efab8a86b971..9f9afe7a236b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c63ef0717ae5bdb7687edeaae41e95dba3d6b87f
+refs/heads/master: 944be922b7213fb844076051e99c2acae3c73676
diff --git a/trunk/drivers/staging/wlan-ng/p80211conv.c b/trunk/drivers/staging/wlan-ng/p80211conv.c
index c1b1afacadb4..b2d6ae53cab6 100644
--- a/trunk/drivers/staging/wlan-ng/p80211conv.c
+++ b/trunk/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,