Skip to contentSkip to conversation

rtlwifi: convert to __packed notation

PATCH In review John W. Linville 3 participants 5 messages Dec 16, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 rtlwifi: convert to __packed notation

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

---
 drivers/net/wireless/rtlwifi/pci.h                 |    6 +++---
 .../net/wireless/rtlwifi/rtl8192ce/rtl8192c-trx.h  |    6 +++---
 drivers/net/wireless/rtlwifi/wifi.h                |    8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)
drivers/net/wireless/rtlwifi/pci.h +3 -3
index cdde858..d36a669 100644
@@ -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
index 91e13c3..53d0e0a 100644
@@ -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
index 0dd6824..3844dc9 100644
@@ -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 */
Signature · 1 line
1.7.3.3
#1 lore raw
Quoted 93 lines · John W. Linville

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

---
 drivers/net/wireless/rtlwifi/pci.h                 |    6 +++---
 .../net/wireless/rtlwifi/rtl8192ce/rtl8192c-trx.h  |    6 +++---
 drivers/net/wireless/rtlwifi/wifi.h                |    8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)
drivers/net/wireless/rtlwifi/pci.h +3 -3
index cdde858..d36a669 100644
@@ -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
index 91e13c3..53d0e0a 100644
@@ -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 +3 -3
index 0dd6824..3844dc9 100644
@@ -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.*/

drivers/net/wireless/rtlwifi/wifi.h struct rtl_qos_parameters { · line 595

Quoted 8 lines
drivers/net/wireless/rtlwifi/wifi.h +1 -1
@@ -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 */

ACK.

As a point of interest, is this the "new" recommended way? The reason I ask is that the Linux headers are mostly in the attribute form.

Larry

#2 lore raw
Quoted 9 lines · Larry Finger
Quoted 3 lines · John W. Linville

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

ACK.

As a point of interest, is this the "new" recommended way? The reason I ask is that the Linux headers are mostly in the attribute form.

AIUI, "__packed" is the one true way. I think this facilitates compling the kernel with compilers other than GCC.

At any rate, Dave Miller threatened to injure me if I kept sending him stuff using "__attribute__ ((packed))"... :-)

John

Signature · 2 lines
John W. Linville		Someday the world will need a hero, and you
[email protected]			might be all we have.  Be ready.
#3 lore raw
Quoted 8 lines · John W. Linville
Quoted 7 lines · Larry Finger
Quoted 3 lines · John W. Linville

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

ACK.

Quoted 8 lines
Quoted 2 lines

As a point of interest, is this the "new" recommended way? The reason I ask is that the Linux headers are mostly in the attribute form.

AIUI, "__packed" is the one true way. I think this facilitates compling the kernel with compilers other than GCC.

At any rate, Dave Miller threatened to injure me if I kept sending him stuff using "__attribute__ ((packed))"... :-)

We certainly would not want that. Maintainers are too hard to find.

One point I missed earlier. As you are affecting both rtlwifi and rtl8192ce, both should be in the patch title.

Larry

maintainer
#4 lore raw

PATCH 1/1 checkpatch.pl: Add "prefer __packed" check

In reply to John W. Linville

There's a __packed #define for this __attribute__((packed)). Might as well get checkpatch to tell people about it.

---

Quoted 10 lines · John W. Linville
Quoted 4 lines · Larry Finger
Quoted 1 line · John W. Linville

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

As a point of interest, is this the "new" recommended way? The reason I ask is that the Linux headers are mostly in the attribute form.

AIUI, "__packed" is the one true way. I think this facilitates compiling the kernel with compilers other than GCC.

At any rate, Dave Miller threatened to injure me if I kept sending him stuff using "__attribute__ ((packed))"... :-)

 scripts/checkpatch.pl |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
scripts/checkpatch.pl +5 -0
index e3c7fc0..6fc24af 100755
@@ -2743,6 +2743,11 @@ sub process {
 			WARN("plain inline is preferred over $1\n" . $herecurr);
 		}
 
+# Check for __attribute__ packed, prefer __packed
+		if ($line =~ /\b__attribute__\s*\(\s*\(.*\bpacked\b/) {
+			WARN("__packed is preferred over __attribute__((packed))\n" . $herecurr);
+		}
+
 # check for sizeof(&)
 		if ($line =~ /\bsizeof\s*\(\s*\&/) {
 			WARN("sizeof(& should be avoided\n" . $herecurr);