aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/freescale/ucc_geth.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/ethernet/freescale/ucc_geth.h')
-rw-r--r--drivers/net/ethernet/freescale/ucc_geth.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/freescale/ucc_geth.h b/drivers/net/ethernet/freescale/ucc_geth.h
index d12fcad145e9..2e395a2566b8 100644
--- a/drivers/net/ethernet/freescale/ucc_geth.h
+++ b/drivers/net/ethernet/freescale/ucc_geth.h
@@ -20,6 +20,7 @@
20 20
21#include <linux/kernel.h> 21#include <linux/kernel.h>
22#include <linux/list.h> 22#include <linux/list.h>
23#include <linux/if_ether.h>
23 24
24#include <asm/immap_qe.h> 25#include <asm/immap_qe.h>
25#include <asm/qe.h> 26#include <asm/qe.h>
@@ -881,7 +882,6 @@ struct ucc_geth_hardware_statistics {
881#define TX_RING_MOD_MASK(size) (size-1) 882#define TX_RING_MOD_MASK(size) (size-1)
882#define RX_RING_MOD_MASK(size) (size-1) 883#define RX_RING_MOD_MASK(size) (size-1)
883 884
884#define ENET_NUM_OCTETS_PER_ADDRESS 6
885#define ENET_GROUP_ADDR 0x01 /* Group address mask 885#define ENET_GROUP_ADDR 0x01 /* Group address mask
886 for ethernet 886 for ethernet
887 addresses */ 887 addresses */
@@ -1051,7 +1051,7 @@ enum ucc_geth_num_of_station_addresses {
1051 1051
1052/* UCC GETH 82xx Ethernet Address Container */ 1052/* UCC GETH 82xx Ethernet Address Container */
1053struct enet_addr_container { 1053struct enet_addr_container {
1054 u8 address[ENET_NUM_OCTETS_PER_ADDRESS]; /* ethernet address */ 1054 u8 address[ETH_ALEN]; /* ethernet address */
1055 enum ucc_geth_enet_address_recognition_location location; /* location in 1055 enum ucc_geth_enet_address_recognition_location location; /* location in
1056 82xx address 1056 82xx address
1057 recognition 1057 recognition
@@ -1194,7 +1194,7 @@ struct ucc_geth_private {
1194 u16 cpucount[NUM_TX_QUEUES]; 1194 u16 cpucount[NUM_TX_QUEUES];
1195 u16 __iomem *p_cpucount[NUM_TX_QUEUES]; 1195 u16 __iomem *p_cpucount[NUM_TX_QUEUES];
1196 int indAddrRegUsed[NUM_OF_PADDRS]; 1196 int indAddrRegUsed[NUM_OF_PADDRS];
1197 u8 paddr[NUM_OF_PADDRS][ENET_NUM_OCTETS_PER_ADDRESS]; /* ethernet address */ 1197 u8 paddr[NUM_OF_PADDRS][ETH_ALEN]; /* ethernet address */
1198 u8 numGroupAddrInHash; 1198 u8 numGroupAddrInHash;
1199 u8 numIndAddrInHash; 1199 u8 numIndAddrInHash;
1200 u8 numIndAddrInReg; 1200 u8 numIndAddrInReg;