diff options
Diffstat (limited to 'drivers/net/tg3.h')
-rw-r--r-- | drivers/net/tg3.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h index 9e7fe0e7cdb8..43dd1d26243c 100644 --- a/drivers/net/tg3.h +++ b/drivers/net/tg3.h | |||
@@ -23,8 +23,6 @@ | |||
23 | #define TG3_BDINFO_NIC_ADDR 0xcUL /* 32-bit */ | 23 | #define TG3_BDINFO_NIC_ADDR 0xcUL /* 32-bit */ |
24 | #define TG3_BDINFO_SIZE 0x10UL | 24 | #define TG3_BDINFO_SIZE 0x10UL |
25 | 25 | ||
26 | #define RX_COPY_THRESHOLD 256 | ||
27 | |||
28 | #define TG3_RX_INTERNAL_RING_SZ_5906 32 | 26 | #define TG3_RX_INTERNAL_RING_SZ_5906 32 |
29 | 27 | ||
30 | #define RX_STD_MAX_SIZE 1536 | 28 | #define RX_STD_MAX_SIZE 1536 |
@@ -2754,9 +2752,11 @@ struct tg3 { | |||
2754 | struct tg3_napi napi[TG3_IRQ_MAX_VECS]; | 2752 | struct tg3_napi napi[TG3_IRQ_MAX_VECS]; |
2755 | void (*write32_rx_mbox) (struct tg3 *, u32, | 2753 | void (*write32_rx_mbox) (struct tg3 *, u32, |
2756 | u32); | 2754 | u32); |
2755 | u32 rx_copy_thresh; | ||
2757 | u32 rx_pending; | 2756 | u32 rx_pending; |
2758 | u32 rx_jumbo_pending; | 2757 | u32 rx_jumbo_pending; |
2759 | u32 rx_std_max_post; | 2758 | u32 rx_std_max_post; |
2759 | u32 rx_offset; | ||
2760 | u32 rx_pkt_map_sz; | 2760 | u32 rx_pkt_map_sz; |
2761 | #if TG3_VLAN_TAG_USED | 2761 | #if TG3_VLAN_TAG_USED |
2762 | struct vlan_group *vlgrp; | 2762 | struct vlan_group *vlgrp; |
@@ -2776,7 +2776,6 @@ struct tg3 { | |||
2776 | unsigned long last_event_jiffies; | 2776 | unsigned long last_event_jiffies; |
2777 | }; | 2777 | }; |
2778 | 2778 | ||
2779 | u32 rx_offset; | ||
2780 | u32 tg3_flags; | 2779 | u32 tg3_flags; |
2781 | #define TG3_FLAG_TAGGED_STATUS 0x00000001 | 2780 | #define TG3_FLAG_TAGGED_STATUS 0x00000001 |
2782 | #define TG3_FLAG_TXD_MBOX_HWBUG 0x00000002 | 2781 | #define TG3_FLAG_TXD_MBOX_HWBUG 0x00000002 |