diff options
author | John W. Linville <linville@tuxdriver.com> | 2010-12-16 09:20:16 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-12-16 09:20:16 -0500 |
commit | e137478b56fd79c397b5c5c74fc08c049a42835a (patch) | |
tree | 637e2d5e8cbd355a8a06ffa757b5826279cbbf3e /drivers/net/wireless/rtlwifi | |
parent | 38cd6b4f52a75926fd81fc85f53f5067dcd809f7 (diff) |
rtlwifi: convert to __packed notation
Use "__packed" instead of "__attribute__ ((packed))"...
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rtlwifi')
-rw-r--r-- | drivers/net/wireless/rtlwifi/pci.h | 6 | ||||
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-trx.h | 6 | ||||
-rw-r--r-- | drivers/net/wireless/rtlwifi/wifi.h | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/drivers/net/wireless/rtlwifi/pci.h b/drivers/net/wireless/rtlwifi/pci.h index cdde8583ad31..d36a66939958 100644 --- a/drivers/net/wireless/rtlwifi/pci.h +++ b/drivers/net/wireless/rtlwifi/pci.h | |||
@@ -131,15 +131,15 @@ enum pci_bridge_vendor { | |||
131 | 131 | ||
132 | struct rtl_rx_desc { | 132 | struct rtl_rx_desc { |
133 | u32 dword[8]; | 133 | u32 dword[8]; |
134 | } __attribute__ ((packed)); | 134 | } __packed; |
135 | 135 | ||
136 | struct rtl_tx_desc { | 136 | struct rtl_tx_desc { |
137 | u32 dword[16]; | 137 | u32 dword[16]; |
138 | } __attribute__ ((packed)); | 138 | } __packed; |
139 | 139 | ||
140 | struct rtl_tx_cmd_desc { | 140 | struct rtl_tx_cmd_desc { |
141 | u32 dword[16]; | 141 | u32 dword[16]; |
142 | } __attribute__ ((packed)); | 142 | } __packed; |
143 | 143 | ||
144 | struct rtl8192_tx_ring { | 144 | struct rtl8192_tx_ring { |
145 | struct rtl_tx_desc *desc; | 145 | struct rtl_tx_desc *desc; |
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-trx.h b/drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-trx.h index 91e13c33351e..53d0e0a5af5c 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-trx.h +++ b/drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-trx.h | |||
@@ -535,7 +535,7 @@ struct rx_fwinfo_92c { | |||
535 | u8 sgi_en:1; | 535 | u8 sgi_en:1; |
536 | u8 rxsc:2; | 536 | u8 rxsc:2; |
537 | u8 reserve:4; | 537 | u8 reserve:4; |
538 | } __attribute__ ((packed)); | 538 | } __packed; |
539 | 539 | ||
540 | struct tx_desc_92c { | 540 | struct tx_desc_92c { |
541 | u32 pktsize:16; | 541 | u32 pktsize:16; |
@@ -637,7 +637,7 @@ struct tx_desc_92c { | |||
637 | u32 nextdescaddress64; | 637 | u32 nextdescaddress64; |
638 | 638 | ||
639 | u32 reserve_pass_pcie_mm_limit[4]; | 639 | u32 reserve_pass_pcie_mm_limit[4]; |
640 | } __attribute__ ((packed)); | 640 | } __packed; |
641 | 641 | ||
642 | struct rx_desc_92c { | 642 | struct rx_desc_92c { |
643 | u32 length:14; | 643 | u32 length:14; |
@@ -695,7 +695,7 @@ struct rx_desc_92c { | |||
695 | u32 bufferaddress; | 695 | u32 bufferaddress; |
696 | u32 bufferaddress64; | 696 | u32 bufferaddress64; |
697 | 697 | ||
698 | } __attribute__ ((packed)); | 698 | } __packed; |
699 | 699 | ||
700 | void rtl92ce_tx_fill_desc(struct ieee80211_hw *hw, | 700 | void rtl92ce_tx_fill_desc(struct ieee80211_hw *hw, |
701 | struct ieee80211_hdr *hdr, | 701 | struct ieee80211_hdr *hdr, |
diff --git a/drivers/net/wireless/rtlwifi/wifi.h b/drivers/net/wireless/rtlwifi/wifi.h index 0dd6824b1942..3844dc94bdbf 100644 --- a/drivers/net/wireless/rtlwifi/wifi.h +++ b/drivers/net/wireless/rtlwifi/wifi.h | |||
@@ -551,13 +551,13 @@ struct rtl_hdr_3addr { | |||
551 | u8 addr3[ETH_ALEN]; | 551 | u8 addr3[ETH_ALEN]; |
552 | __le16 seq_ctl; | 552 | __le16 seq_ctl; |
553 | u8 payload[0]; | 553 | u8 payload[0]; |
554 | } __attribute__ ((packed)); | 554 | } __packed; |
555 | 555 | ||
556 | struct rtl_info_element { | 556 | struct rtl_info_element { |
557 | u8 id; | 557 | u8 id; |
558 | u8 len; | 558 | u8 len; |
559 | u8 data[0]; | 559 | u8 data[0]; |
560 | } __attribute__ ((packed)); | 560 | } __packed; |
561 | 561 | ||
562 | struct rtl_probe_rsp { | 562 | struct rtl_probe_rsp { |
563 | struct rtl_hdr_3addr header; | 563 | struct rtl_hdr_3addr header; |
@@ -567,7 +567,7 @@ struct rtl_probe_rsp { | |||
567 | /*SSID, supported rates, FH params, DS params, | 567 | /*SSID, supported rates, FH params, DS params, |
568 | CF params, IBSS params, TIM (if beacon), RSN */ | 568 | CF params, IBSS params, TIM (if beacon), RSN */ |
569 | struct rtl_info_element info_element[0]; | 569 | struct rtl_info_element info_element[0]; |
570 | } __attribute__ ((packed)); | 570 | } __packed; |
571 | 571 | ||
572 | /*LED related.*/ | 572 | /*LED related.*/ |
573 | /*ledpin Identify how to implement this SW led.*/ | 573 | /*ledpin Identify how to implement this SW led.*/ |
@@ -589,7 +589,7 @@ struct rtl_qos_parameters { | |||
589 | u8 aifs; | 589 | u8 aifs; |
590 | u8 flag; | 590 | u8 flag; |
591 | __le16 tx_op; | 591 | __le16 tx_op; |
592 | } __attribute__ ((packed)); | 592 | } __packed; |
593 | 593 | ||
594 | struct rt_smooth_data { | 594 | struct rt_smooth_data { |
595 | u32 elements[100]; /*array to store values */ | 595 | u32 elements[100]; /*array to store values */ |