2 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/mlx4/eq.c b/drivers/net/mlx4/eq.c
index 423053482ed5..22d0b3b796b4 100644
--- a/drivers/net/mlx4/eq.c
+++ b/drivers/net/mlx4/eq.c
@@ -110,7 +110,7 @@ struct mlx4_eqe {
                u32             raw[6];
                struct {
                        __be32  cqn;
-                } __attribute__((packed)) comp;
+                } __packed comp;
                struct {
                        u16     reserved1;
                        __be16  token;
@@ -118,27 +118,27 @@ struct mlx4_eqe {
                        u8      reserved3[3];
                        u8      status;
                        __be64  out_param;
-                } __attribute__((packed)) cmd;
+                } __packed cmd;
                struct {
                        __be32  qpn;
-                } __attribute__((packed)) qp;
+                } __packed qp;
                struct {
                        __be32  srqn;
-                } __attribute__((packed)) srq;
+                } __packed srq;
                struct {
                        __be32  cqn;
                        u32     reserved1;
                        u8      reserved2[3];
                        u8      syndrome;
-                } __attribute__((packed)) cq_err;
+                } __packed cq_err;
                struct {
                        u32     reserved1[2];
                        __be32  port;
-                } __attribute__((packed)) port_change;
+                } __packed port_change;
        }                       event;
        u8                      reserved3[3];
        u8                      owner;
-} __attribute__((packed));
+} __packed;
 static void eq_set_ci(struct mlx4_eq *eq, int req_not)
 {
diff --git a/drivers/net/mlx4/mr.c b/drivers/net/mlx4/mr.c
index 3dc69be4949f..9c188bdd7f4f 100644
--- a/drivers/net/mlx4/mr.c
+++ b/drivers/net/mlx4/mr.c
@@ -58,7 +58,7 @@ struct mlx4_mpt_entry {
        __be32 mtt_sz;
        __be32 entity_size;
        __be32 first_byte_offset;
-} __attribute__((packed));
+} __packed;
 #define MLX4_MPT_FLAG_SW_OWNS       (0xfUL << 28)
 #define MLX4_MPT_FLAG_FREE          (0x3UL << 28)

diff --git a/drivers/net/mlx4/eq.c b/drivers/net/mlx4/eq.c index 423053482ed5..22d0b3b796b4 100644 --- a/drivers/net/mlx4/eq.c +++ b/drivers/net/mlx4/eq.c
@@ -110,7 +110,7 @@ struct mlx4_eqe {
110	u32 raw[6];	110	u32 raw[6];
111	struct {	111	struct {
112	__be32 cqn;	112	__be32 cqn;
113	} __attribute__((packed)) comp;	113	} __packed comp;
114	struct {	114	struct {
115	u16 reserved1;	115	u16 reserved1;
116	__be16 token;	116	__be16 token;
@@ -118,27 +118,27 @@ struct mlx4_eqe {
118	u8 reserved3[3];	118	u8 reserved3[3];
119	u8 status;	119	u8 status;
120	__be64 out_param;	120	__be64 out_param;
121	} __attribute__((packed)) cmd;	121	} __packed cmd;
122	struct {	122	struct {
123	__be32 qpn;	123	__be32 qpn;
124	} __attribute__((packed)) qp;	124	} __packed qp;
125	struct {	125	struct {
126	__be32 srqn;	126	__be32 srqn;
127	} __attribute__((packed)) srq;	127	} __packed srq;
128	struct {	128	struct {
129	__be32 cqn;	129	__be32 cqn;
130	u32 reserved1;	130	u32 reserved1;
131	u8 reserved2[3];	131	u8 reserved2[3];
132	u8 syndrome;	132	u8 syndrome;
133	} __attribute__((packed)) cq_err;	133	} __packed cq_err;
134	struct {	134	struct {
135	u32 reserved1[2];	135	u32 reserved1[2];
136	__be32 port;	136	__be32 port;
137	} __attribute__((packed)) port_change;	137	} __packed port_change;
138	} event;	138	} event;
139	u8 reserved3[3];	139	u8 reserved3[3];
140	u8 owner;	140	u8 owner;
141	} __attribute__((packed));	141	} __packed;
142		142
143	static void eq_set_ci(struct mlx4_eq *eq, int req_not)	143	static void eq_set_ci(struct mlx4_eq *eq, int req_not)
144	{	144	{


diff --git a/drivers/net/mlx4/mr.c b/drivers/net/mlx4/mr.c index 3dc69be4949f..9c188bdd7f4f 100644 --- a/drivers/net/mlx4/mr.c +++ b/drivers/net/mlx4/mr.c
@@ -58,7 +58,7 @@ struct mlx4_mpt_entry {
58	__be32 mtt_sz;	58	__be32 mtt_sz;
59	__be32 entity_size;	59	__be32 entity_size;
60	__be32 first_byte_offset;	60	__be32 first_byte_offset;
61	} __attribute__((packed));	61	} __packed;
62		62
63	#define MLX4_MPT_FLAG_SW_OWNS (0xfUL << 28)	63	#define MLX4_MPT_FLAG_SW_OWNS (0xfUL << 28)
64	#define MLX4_MPT_FLAG_FREE (0x3UL << 28)	64	#define MLX4_MPT_FLAG_FREE (0x3UL << 28)