include: Convert ethernet mac address declarations to use ETH_ALEN

It's convenient to have ethernet mac addresses use
ETH_ALEN to be able to grep for them a bit easier and
also to ensure that the addresses are __aligned(2).

Add #include <linux/if_ether.h> as necessary.

Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 9 insertions, 7 deletions

diff --git a/include/linux/mlx4/device.h b/include/linux/mlx4/device.h
index 6aebdfe0ed8b..09ef2f448a00 100644
--- a/include/linux/mlx4/device.h
+++ b/include/linux/mlx4/device.h
@@ -33,6 +33,7 @@
 #ifndef MLX4_DEVICE_H
 #define MLX4_DEVICE_H
 
+#include <linux/if_ether.h>
 #include <linux/pci.h>
 #include <linux/completion.h>
 #include <linux/radix-tree.h>
@@ -620,7 +621,7 @@ struct mlx4_eth_av {
         u8              dgid[16];
         u32             reserved4[2];
         __be16          vlan;
-        u8              mac[6];
+        u8              mac[ETH_ALEN];
 };
 
 union mlx4_ext_av {
@@ -914,10 +915,10 @@ enum mlx4_net_trans_promisc_mode {
 };
 
 struct mlx4_spec_eth {
-        u8      dst_mac[6];
-        u8      dst_mac_msk[6];
-        u8      src_mac[6];
-        u8      src_mac_msk[6];
+        u8      dst_mac[ETH_ALEN];
+        u8      dst_mac_msk[ETH_ALEN];
+        u8      src_mac[ETH_ALEN];
+        u8      src_mac_msk[ETH_ALEN];
         u8      ether_type_enable;
         __be16  ether_type;
         __be16  vlan_id_msk;
diff --git a/include/linux/mlx4/qp.h b/include/linux/mlx4/qp.h
index 262deac02c9e..6d351473c292 100644
--- a/include/linux/mlx4/qp.h
+++ b/include/linux/mlx4/qp.h
@@ -34,6 +34,7 @@
 #define MLX4_QP_H
 
 #include <linux/types.h>
+#include <linux/if_ether.h>
 
 #include <linux/mlx4/device.h>
 
@@ -143,7 +144,7 @@ struct mlx4_qp_path {
         u8                      feup;
         u8                      fvl_rx;
         u8                      reserved4[2];
-        u8                      dmac[6];
+        u8                      dmac[ETH_ALEN];
 };
 
 enum { /* fl */
@@ -318,7 +319,7 @@ struct mlx4_wqe_datagram_seg {
         __be32                  dqpn;
         __be32                  qkey;
         __be16                  vlan;
-        u8                      mac[6];
+        u8                      mac[ETH_ALEN];
 };
 
 struct mlx4_wqe_lso_seg {