diff options
| author | David S. Miller <davem@davemloft.net> | 2008-06-10 04:54:31 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-06-10 04:54:31 -0400 |
| commit | 788c0a53164c05c5ccdb1472474372b72ba74644 (patch) | |
| tree | 5f274102e3dc4bcca6cb3a695aa2c8228ad5fc4f /drivers/net/wireless/rtl8187.h | |
| parent | e64bda89b8fe81cce9b4a20885d2c204c2d52532 (diff) | |
| parent | 78cf07472f0ede8394bacc4bc02354505080cfe1 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Conflicts:
drivers/net/ps3_gelic_wireless.c
drivers/net/wireless/libertas/main.c
Diffstat (limited to 'drivers/net/wireless/rtl8187.h')
| -rw-r--r-- | drivers/net/wireless/rtl8187.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/wireless/rtl8187.h b/drivers/net/wireless/rtl8187.h index 076d88b6db0e..a0cfb666de0e 100644 --- a/drivers/net/wireless/rtl8187.h +++ b/drivers/net/wireless/rtl8187.h | |||
| @@ -44,12 +44,6 @@ struct rtl8187_rx_hdr { | |||
| 44 | __le64 mac_time; | 44 | __le64 mac_time; |
| 45 | } __attribute__((packed)); | 45 | } __attribute__((packed)); |
| 46 | 46 | ||
| 47 | struct rtl8187_tx_info { | ||
| 48 | struct ieee80211_tx_control *control; | ||
| 49 | struct urb *urb; | ||
| 50 | struct ieee80211_hw *dev; | ||
| 51 | }; | ||
| 52 | |||
| 53 | struct rtl8187_tx_hdr { | 47 | struct rtl8187_tx_hdr { |
| 54 | __le32 flags; | 48 | __le32 flags; |
| 55 | #define RTL8187_TX_FLAG_NO_ENCRYPT (1 << 15) | 49 | #define RTL8187_TX_FLAG_NO_ENCRYPT (1 << 15) |