diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-12 06:35:23 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-12 06:37:32 -0400 |
| commit | 365d46dc9be9b3c833990a06f3994b1987eda578 (patch) | |
| tree | 9397d1304144a288411f2118707f44ff5e862fa6 /include/net/ieee80211.h | |
| parent | 5dc64a3442b98eaa0e3730c35fcf00cf962a93e7 (diff) | |
| parent | fd048088306656824958e7783ffcee27e241b361 (diff) | |
Merge branch 'linus' into x86/xen
Conflicts:
arch/x86/kernel/cpu/common.c
arch/x86/kernel/process_64.c
arch/x86/xen/enlighten.c
Diffstat (limited to 'include/net/ieee80211.h')
| -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 b31399e1fd83..6048579d0b24 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); | |||
| 190 | #endif | 190 | #endif |
| 191 | #include <net/iw_handler.h> /* new driver API */ | 191 | #include <net/iw_handler.h> /* new driver API */ |
| 192 | 192 | ||
| 193 | #ifndef ETH_P_PAE | ||
| 194 | #define ETH_P_PAE 0x888E /* Port Access Entity (IEEE 802.1X) */ | ||
| 195 | #endif /* ETH_P_PAE */ | ||
| 196 | |||
| 197 | #define ETH_P_PREAUTH 0x88C7 /* IEEE 802.11i pre-authentication */ | 193 | #define ETH_P_PREAUTH 0x88C7 /* IEEE 802.11i pre-authentication */ |
| 198 | 194 | ||
| 199 | #ifndef ETH_P_80211_RAW | 195 | #ifndef ETH_P_80211_RAW |