summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/rtl818x
diff options
context:
space:
mode:
authorAndrea Merello <andrea.merello@gmail.com>2014-03-26 20:58:43 +0100
committerJohn W. Linville <linville@tuxdriver.com>2014-03-27 19:20:07 +0100
commitac546bfb30a867fc449028bcd33543e01a8ce605 (patch)
treeec944aa8dd7d8e753dd403d7da109b805de9940e /drivers/net/wireless/rtl818x
parentrtl8180: add rtl8187se chip type (diff)
downloadlinux-ac546bfb30a867fc449028bcd33543e01a8ce605.tar.xz
linux-ac546bfb30a867fc449028bcd33543e01a8ce605.zip
rtl8180: add rtl8187se fields to TX descriptor
This patch modifies the TX descriptor struct so it can work also for rtl8187se. Some reserved field is now meaningful, and where needed union is used. Signed-off-by: Andrea Merello <andrea.merello@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rtl818x')
-rw-r--r--drivers/net/wireless/rtl818x/rtl8180/rtl8180.h16
1 files changed, 14 insertions, 2 deletions
diff --git a/drivers/net/wireless/rtl818x/rtl8180/rtl8180.h b/drivers/net/wireless/rtl818x/rtl8180/rtl8180.h
index e7127f30ec09..47a084ccc555 100644
--- a/drivers/net/wireless/rtl818x/rtl8180/rtl8180.h
+++ b/drivers/net/wireless/rtl818x/rtl8180/rtl8180.h
@@ -34,13 +34,25 @@ struct rtl8180_tx_desc {
__le16 rts_duration;
__le16 plcp_len;
__le32 tx_buf;
- __le32 frame_len;
+ union{
+ __le32 frame_len;
+ struct {
+ __le16 frame_len_se;
+ __le16 frame_duration;
+ } __packed;
+ } __packed;
__le32 next_tx_desc;
u8 cw;
u8 retry_limit;
u8 agc;
u8 flags2;
- u32 reserved[2];
+ /* rsvd for 8180/8185.
+ * valid for 8187se but we dont use it
+ */
+ u32 reserved;
+ /* all rsvd for 8180/8185 */
+ __le16 flags3;
+ __le16 frag_qsize;
} __packed;
struct rtl8180_rx_desc {