diff options
author | David S. Miller <davem@davemloft.net> | 2010-01-19 14:43:42 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-01-19 14:43:42 -0500 |
commit | 6373464288cab09bc641be301d8d30fc9f64ba71 (patch) | |
tree | c1bc92dc630aa15da2e12bc0d09c92169817a702 /drivers/staging/rtl8187se/ieee80211/ieee80211.h | |
parent | 6d955180b2f9ccff444df06265160868cabb289a (diff) | |
parent | 730dd70549e0ec755dd55615ba5cfc38a482a947 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-core.h
Diffstat (limited to 'drivers/staging/rtl8187se/ieee80211/ieee80211.h')
-rw-r--r-- | drivers/staging/rtl8187se/ieee80211/ieee80211.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211.h b/drivers/staging/rtl8187se/ieee80211/ieee80211.h index 0d490c164db..9086047c32d 100644 --- a/drivers/staging/rtl8187se/ieee80211/ieee80211.h +++ b/drivers/staging/rtl8187se/ieee80211/ieee80211.h | |||
@@ -482,15 +482,6 @@ struct ieee80211_header_data { | |||
482 | u16 seq_ctrl; | 482 | u16 seq_ctrl; |
483 | }; | 483 | }; |
484 | 484 | ||
485 | struct ieee80211_hdr_3addr { | ||
486 | u16 frame_ctl; | ||
487 | u16 duration_id; | ||
488 | u8 addr1[ETH_ALEN]; | ||
489 | u8 addr2[ETH_ALEN]; | ||
490 | u8 addr3[ETH_ALEN]; | ||
491 | u16 seq_ctl; | ||
492 | } __attribute__ ((packed)); | ||
493 | |||
494 | struct ieee80211_hdr_4addr { | 485 | struct ieee80211_hdr_4addr { |
495 | u16 frame_ctl; | 486 | u16 frame_ctl; |
496 | u16 duration_id; | 487 | u16 duration_id; |