Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e137478b authored by John W. Linville's avatar John W. Linville
Browse files

rtlwifi: convert to __packed notation 



Use "__packed" instead of "__attribute__ ((packed))"...

Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 38cd6b4f

drivers/net/wireless/rtlwifi/pci.h

+3 −3
Original line number Diff line number Diff line
@@ -131,15 +131,15 @@ enum pci_bridge_vendor { 


struct rtl_rx_desc {

	u32 dword[8];

} __attribute__ ((packed));

} __packed;



struct rtl_tx_desc {

	u32 dword[16];

} __attribute__ ((packed));

} __packed;



struct rtl_tx_cmd_desc {

	u32 dword[16];

} __attribute__ ((packed));

} __packed;



struct rtl8192_tx_ring {

	struct rtl_tx_desc *desc;

drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-trx.h

+3 −3
Original line number Diff line number Diff line
@@ -535,7 +535,7 @@ struct rx_fwinfo_92c { 
	u8 sgi_en:1;

	u8 rxsc:2;

	u8 reserve:4;

} __attribute__ ((packed));

} __packed;



struct tx_desc_92c {

	u32 pktsize:16;
@@ -637,7 +637,7 @@ struct tx_desc_92c { 
	u32 nextdescaddress64;



	u32 reserve_pass_pcie_mm_limit[4];

} __attribute__ ((packed));

} __packed;



struct rx_desc_92c {

	u32 length:14;
@@ -695,7 +695,7 @@ struct rx_desc_92c { 
	u32 bufferaddress;

	u32 bufferaddress64;



} __attribute__ ((packed));

} __packed;



void rtl92ce_tx_fill_desc(struct ieee80211_hw *hw,

			  struct ieee80211_hdr *hdr,

drivers/net/wireless/rtlwifi/wifi.h

+4 −4
Original line number Diff line number Diff line
@@ -551,13 +551,13 @@ struct rtl_hdr_3addr { 
	u8 addr3[ETH_ALEN];

	__le16 seq_ctl;

	u8 payload[0];

} __attribute__ ((packed));

} __packed;



struct rtl_info_element {

	u8 id;

	u8 len;

	u8 data[0];

} __attribute__ ((packed));

} __packed;



struct rtl_probe_rsp {

	struct rtl_hdr_3addr header;
@@ -567,7 +567,7 @@ struct rtl_probe_rsp { 
	/*SSID, supported rates, FH params, DS params,

	   CF params, IBSS params, TIM (if beacon), RSN */

	struct rtl_info_element info_element[0];

} __attribute__ ((packed));

} __packed;



/*LED related.*/

/*ledpin Identify how to implement this SW led.*/
@@ -589,7 +589,7 @@ struct rtl_qos_parameters { 
	u8 aifs;

	u8 flag;

	__le16 tx_op;

} __attribute__ ((packed));

} __packed;



struct rt_smooth_data {

	u32 elements[100];	/*array to store values */