diff options
Diffstat (limited to 'drivers/net/gianfar.h')
-rw-r--r-- | drivers/net/gianfar.h | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/drivers/net/gianfar.h b/drivers/net/gianfar.h index cbb451011cb5..3d72dc43dca5 100644 --- a/drivers/net/gianfar.h +++ b/drivers/net/gianfar.h | |||
@@ -333,7 +333,7 @@ extern const char gfar_driver_version[]; | |||
333 | #define IMASK_BSY 0x20000000 | 333 | #define IMASK_BSY 0x20000000 |
334 | #define IMASK_EBERR 0x10000000 | 334 | #define IMASK_EBERR 0x10000000 |
335 | #define IMASK_MSRO 0x04000000 | 335 | #define IMASK_MSRO 0x04000000 |
336 | #define IMASK_GRSC 0x02000000 | 336 | #define IMASK_GTSC 0x02000000 |
337 | #define IMASK_BABT 0x01000000 | 337 | #define IMASK_BABT 0x01000000 |
338 | #define IMASK_TXC 0x00800000 | 338 | #define IMASK_TXC 0x00800000 |
339 | #define IMASK_TXEEN 0x00400000 | 339 | #define IMASK_TXEEN 0x00400000 |
@@ -344,7 +344,7 @@ extern const char gfar_driver_version[]; | |||
344 | #define IMASK_XFUN 0x00010000 | 344 | #define IMASK_XFUN 0x00010000 |
345 | #define IMASK_RXB0 0x00008000 | 345 | #define IMASK_RXB0 0x00008000 |
346 | #define IMASK_MAG 0x00000800 | 346 | #define IMASK_MAG 0x00000800 |
347 | #define IMASK_GTSC 0x00000100 | 347 | #define IMASK_GRSC 0x00000100 |
348 | #define IMASK_RXFEN0 0x00000080 | 348 | #define IMASK_RXFEN0 0x00000080 |
349 | #define IMASK_FIR 0x00000008 | 349 | #define IMASK_FIR 0x00000008 |
350 | #define IMASK_FIQ 0x00000004 | 350 | #define IMASK_FIQ 0x00000004 |
@@ -401,6 +401,10 @@ extern const char gfar_driver_version[]; | |||
401 | #define FPR_FILER_MASK 0xFFFFFFFF | 401 | #define FPR_FILER_MASK 0xFFFFFFFF |
402 | #define MAX_FILER_IDX 0xFF | 402 | #define MAX_FILER_IDX 0xFF |
403 | 403 | ||
404 | /* This default RIR value directly corresponds | ||
405 | * to the 3-bit hash value generated */ | ||
406 | #define DEFAULT_RIR0 0x05397700 | ||
407 | |||
404 | /* RQFCR register bits */ | 408 | /* RQFCR register bits */ |
405 | #define RQFCR_GPI 0x80000000 | 409 | #define RQFCR_GPI 0x80000000 |
406 | #define RQFCR_HASHTBL_Q 0x00000000 | 410 | #define RQFCR_HASHTBL_Q 0x00000000 |
@@ -936,6 +940,15 @@ struct gfar_priv_tx_q { | |||
936 | unsigned short txtime; | 940 | unsigned short txtime; |
937 | }; | 941 | }; |
938 | 942 | ||
943 | /* | ||
944 | * Per RX queue stats | ||
945 | */ | ||
946 | struct rx_q_stats { | ||
947 | unsigned long rx_packets; | ||
948 | unsigned long rx_bytes; | ||
949 | unsigned long rx_dropped; | ||
950 | }; | ||
951 | |||
939 | /** | 952 | /** |
940 | * struct gfar_priv_rx_q - per rx queue structure | 953 | * struct gfar_priv_rx_q - per rx queue structure |
941 | * @rxlock: per queue rx spin lock | 954 | * @rxlock: per queue rx spin lock |
@@ -958,6 +971,7 @@ struct gfar_priv_rx_q { | |||
958 | struct rxbd8 *cur_rx; | 971 | struct rxbd8 *cur_rx; |
959 | struct net_device *dev; | 972 | struct net_device *dev; |
960 | struct gfar_priv_grp *grp; | 973 | struct gfar_priv_grp *grp; |
974 | struct rx_q_stats stats; | ||
961 | u16 skb_currx; | 975 | u16 skb_currx; |
962 | u16 qindex; | 976 | u16 qindex; |
963 | unsigned int rx_ring_size; | 977 | unsigned int rx_ring_size; |