summaryrefslogtreecommitdiff
path: root/drivers/net/ethernet/broadcom/cnic_if.h
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2013-08-02 03:17:49 +0400
committerDavid S. Miller <davem@davemloft.net>2013-08-02 23:33:54 +0400
commit1409a93274bb1b17f0b7a0b255a75e80899eec11 (patch)
tree778099b4c28e9089af438ca53f79613c43617069 /drivers/net/ethernet/broadcom/cnic_if.h
parent574e2af7c0af3273836def5e66f236521bb433c9 (diff)
downloadlinux-1409a93274bb1b17f0b7a0b255a75e80899eec11.tar.xz
ethernet: Convert mac address uses of 6 to ETH_ALEN
Use the normal #define to help grep find mac addresses and ensure that addresses are aligned. pasemi.h has an unaligned access to mac_addr, unchanged for now. Signed-off-by: Joe Perches <joe@perches.com> Acked-by: Olof Johansson <olof@lixom.net> # pasemi_mac pieces Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom/cnic_if.h')
-rw-r--r--drivers/net/ethernet/broadcom/cnic_if.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/broadcom/cnic_if.h b/drivers/net/ethernet/broadcom/cnic_if.h
index 82a03120fcb1..95aff7642b85 100644
--- a/drivers/net/ethernet/broadcom/cnic_if.h
+++ b/drivers/net/ethernet/broadcom/cnic_if.h
@@ -238,8 +238,8 @@ struct cnic_sock {
u16 src_port;
u16 dst_port;
u16 vlan_id;
- unsigned char old_ha[6];
- unsigned char ha[6];
+ unsigned char old_ha[ETH_ALEN];
+ unsigned char ha[ETH_ALEN];
u32 mtu;
u32 cid;
u32 l5_cid;
@@ -308,7 +308,7 @@ struct cnic_dev {
#define CNIC_F_BNX2_CLASS 3
#define CNIC_F_BNX2X_CLASS 4
atomic_t ref_count;
- u8 mac_addr[6];
+ u8 mac_addr[ETH_ALEN];
int max_iscsi_conn;
int max_fcoe_conn;