diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-12 06:39:30 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-12 06:39:50 -0400 |
| commit | 4c7145a1ec1bb789d5f07e47510e8bda546a7c4a (patch) | |
| tree | e2767b77e5413473a3bba302237f4669a203f183 /include/net/ieee80211.h | |
| parent | 74e91604b2452c15bbe72d77b37cf47ed0310d13 (diff) | |
| parent | fd048088306656824958e7783ffcee27e241b361 (diff) | |
Merge branch 'linus' into x86/spinlocks
Done to prevent this failure of an Octopus merge:
Added arch/arm/include/asm/byteorder.h in both, but differently.
ERROR: Merge conflict in arch/arm/include/asm/byteorder.h
Auto-merging include/asm-x86/spinlock.h
ERROR: Merge conflict in include/asm-x86/spinlock.h
fatal: merge program failed
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 |