Staging: merge staging patches into Linus's main branch

[sfrench/cifs-2.6.git] / drivers / staging / rtl8187se / ieee80211 / ieee80211.h

diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211.h b/drivers/staging/rtl8187se/ieee80211/ieee80211.h
index c4ab683e8f6150a7b3afeb952df7a15bf55daa89..4cd95c3dc9479d0540bb3be793c10b7d223de09b 100644 (file)
--- a/drivers/staging/rtl8187se/ieee80211/ieee80211.h
+++ b/drivers/staging/rtl8187se/ieee80211/ieee80211.h
@@ -479,15 +479,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;