Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 942875ffc102a6b9992120808e4990eda7a618f6

Authored by Gustavo F. Padovan
Committed by David S. Miller
1 parent 2e4e7a97ed
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

irda: Use __packed annotation instead IRDA_PACKED macro 

Remove IRDA_PACKED macro, which maps to __attribute__((packed)). IRDA is
one of the last users of __attribute__((packet)). Networking code uses
__packed now.

Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 2 changed files with 9 additions and 13 deletions Side-by-side Diff

include/net/irda/irda.h
Diff comments   View file @ 942875f
... ... @@ -53,10 +53,6 @@
53 53 #ifndef IRDA_ALIGN
54 54 # define IRDA_ALIGN __attribute__((aligned))
55 55 #endif
56   -#ifndef IRDA_PACK
57   -# define IRDA_PACK __attribute__((packed))
58   -#endif
59   -
60 56  
61 57 #ifdef CONFIG_IRDA_DEBUG
62 58  
include/net/irda/irlap_frame.h
Diff comments   View file @ 942875f
... ... @@ -85,7 +85,7 @@
85 85 struct disc_frame {
86 86 __u8 caddr; /* Connection address */
87 87 __u8 control;
88   -} IRDA_PACK;
  88 +} __packed;
89 89  
90 90 struct xid_frame {
91 91 __u8 caddr; /* Connection address */
92 92  
93 93  
94 94  
95 95  
96 96  
97 97  
... ... @@ -96,41 +96,41 @@
96 96 __u8 flags; /* Discovery flags */
97 97 __u8 slotnr;
98 98 __u8 version;
99   -} IRDA_PACK;
  99 +} __packed;
100 100  
101 101 struct test_frame {
102 102 __u8 caddr; /* Connection address */
103 103 __u8 control;
104 104 __le32 saddr; /* Source device address */
105 105 __le32 daddr; /* Destination device address */
106   -} IRDA_PACK;
  106 +} __packed;
107 107  
108 108 struct ua_frame {
109 109 __u8 caddr;
110 110 __u8 control;
111 111 __le32 saddr; /* Source device address */
112 112 __le32 daddr; /* Dest device address */
113   -} IRDA_PACK;
  113 +} __packed;
114 114  
115 115 struct dm_frame {
116 116 __u8 caddr; /* Connection address */
117 117 __u8 control;
118   -} IRDA_PACK;
  118 +} __packed;
119 119  
120 120 struct rd_frame {
121 121 __u8 caddr; /* Connection address */
122 122 __u8 control;
123   -} IRDA_PACK;
  123 +} __packed;
124 124  
125 125 struct rr_frame {
126 126 __u8 caddr; /* Connection address */
127 127 __u8 control;
128   -} IRDA_PACK;
  128 +} __packed;
129 129  
130 130 struct i_frame {
131 131 __u8 caddr;
132 132 __u8 control;
133   -} IRDA_PACK;
  133 +} __packed;
134 134  
135 135 struct snrm_frame {
136 136 __u8 caddr;
... ... @@ -138,7 +138,7 @@
138 138 __le32 saddr;
139 139 __le32 daddr;
140 140 __u8 ncaddr;
141   -} IRDA_PACK;
  141 +} __packed;
142 142  
143 143 void irlap_queue_xmit(struct irlap_cb *self, struct sk_buff *skb);
144 144 void irlap_send_discovery_xid_frame(struct irlap_cb *, int S, __u8 s,