diff --git a/[refs] b/[refs] index 92fb5f829155..4e787d6995b6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3ed6e0803b4fe95107f6cb5a432587d03cd4d17a +refs/heads/master: 55ad175fb65a4a3a7e4d1aa13c460de281b4e8ac diff --git a/trunk/include/net/ieee80211.h b/trunk/include/net/ieee80211.h index b31399e1fd83..6048579d0b24 100644 --- a/trunk/include/net/ieee80211.h +++ b/trunk/include/net/ieee80211.h @@ -190,10 +190,6 @@ const char *escape_essid(const char *essid, u8 essid_len); #endif #include /* new driver API */ -#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 */ #ifndef ETH_P_80211_RAW