diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-01 08:55:41 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-01 08:55:41 (GMT) |
| commit | 788df7322a7543a337c1ea400d38b621346ea78e (patch) | |
| tree | 30e9ba775a44839726e07f79f2437ec431d1d8e6 /include | |
| parent | 6e50e8a2136f1a90de251c653226ded447c5c915 (diff) | |
| parent | 0d5f0316593df606515b17b037a1fd36c4b8bfdf (diff) | |
| download | linux-788df7322a7543a337c1ea400d38b621346ea78e.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/ieee80211.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h index b31399e..6048579 100644 --- a/include/net/ieee80211.h +++ b/include/net/ieee80211.h @@ -190,10 +190,6 @@ const char *escape_essid(const char *essid, u8 essid_len); #endif #include <net/iw_handler.h> /* 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 |