diff --git a/[refs] b/[refs]
index 16ee59822645..d04c9bf09dd3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 67e0e473fb54e7657f6604236e42ef07fd7a2768
+refs/heads/master: 3ec0f4857df4c3dd0d0455ce5b2470b4be77fc77
diff --git a/trunk/drivers/net/wireless/hostap/hostap_common.h b/trunk/drivers/net/wireless/hostap/hostap_common.h
index 3f86263a08fd..76f5ef1b59d3 100644
--- a/trunk/drivers/net/wireless/hostap/hostap_common.h
+++ b/trunk/drivers/net/wireless/hostap/hostap_common.h
@@ -7,14 +7,6 @@
 #define MACSTR "%02x:%02x:%02x:%02x:%02x:%02x"
 
 
-#ifndef ETH_P_PAE
-#define ETH_P_PAE 0x888E /* Port Access Entity (IEEE 802.1X) */
-#endif /* ETH_P_PAE */
-
-#define ETH_P_PREAUTH 0x88C7 /* IEEE 802.11i pre-authentication */
-
-
-
 /* IEEE 802.11 defines */
 
 #define WLAN_FC_PVER (BIT(1) | BIT(0))
diff --git a/trunk/drivers/net/wireless/hostap/hostap_wlan.h b/trunk/drivers/net/wireless/hostap/hostap_wlan.h
index 7781e8264d64..cc061e1560d3 100644
--- a/trunk/drivers/net/wireless/hostap/hostap_wlan.h
+++ b/trunk/drivers/net/wireless/hostap/hostap_wlan.h
@@ -18,13 +18,6 @@
  * prism2_send_mgmt() sends these with dev_queue_xmit() to prism2_tx(). */
 #define ETH_P_HOSTAP ETH_P_CONTROL
 
-#ifndef ARPHRD_IEEE80211
-#define ARPHRD_IEEE80211 801
-#endif
-#ifndef ARPHRD_IEEE80211_PRISM
-#define ARPHRD_IEEE80211_PRISM 802
-#endif
-
 /* ARPHRD_IEEE80211_PRISM uses a bloated version of Prism2 RX frame header
  * (from linux-wlan-ng) */
 struct linux_wlan_ng_val {