diff options
| author | Larry Finger <Larry.Finger@lwfinger.net> | 2010-01-14 13:13:47 -0600 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-01-14 18:16:57 -0500 |
| commit | b6b1ac69372da996f40863358df41ca77075b249 (patch) | |
| tree | 5308805b70cedda843d20d6bb054d2d8c442a671 /drivers/staging/rtl8187se/ieee80211/ieee80211.h | |
| parent | a0f2e0fca1e72c1de07e834be05b61d33842253e (diff) | |
| download | kernel_samsung_smdk4412-b6b1ac69372da996f40863358df41ca77075b249.zip kernel_samsung_smdk4412-b6b1ac69372da996f40863358df41ca77075b249.tar.gz kernel_samsung_smdk4412-b6b1ac69372da996f40863358df41ca77075b249.tar.bz2 | |
Staging: r8187se: Fix compile error from wireless-testing commit 7044cc56
In wireless-testing, commit 7044cc56 added struct ieee80211_hdr_3addr
to include/linux/ieee80211.h. This definition collides with one that is
in the r8187se driver in staging.
The conflict is resolved by changing r8187se to use the definition from
include/linuc/ieee80211.h.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
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 3222c22..4625787 100644 --- a/drivers/staging/rtl8187se/ieee80211/ieee80211.h +++ b/drivers/staging/rtl8187se/ieee80211/ieee80211.h @@ -482,15 +482,6 @@ struct ieee80211_header_data { u16 seq_ctrl; }; -struct ieee80211_hdr_3addr { - u16 frame_ctl; - u16 duration_id; - u8 addr1[ETH_ALEN]; - u8 addr2[ETH_ALEN]; - u8 addr3[ETH_ALEN]; - u16 seq_ctl; -} __attribute__ ((packed)); - struct ieee80211_hdr_4addr { u16 frame_ctl; u16 duration_id; |