patch-2.4.22 linux-2.4.22/drivers/net/e1000/e1000.h
Next file: linux-2.4.22/drivers/net/e1000/e1000_ethtool.c
Previous file: linux-2.4.22/drivers/net/e1000/Makefile
Back to the patch index
Back to the overall index
- Lines: 39
- Date:
2003-08-25 04:44:42.000000000 -0700
- Orig file:
linux-2.4.21/drivers/net/e1000/e1000.h
- Orig date:
2003-06-13 07:51:34.000000000 -0700
diff -urN linux-2.4.21/drivers/net/e1000/e1000.h linux-2.4.22/drivers/net/e1000/e1000.h
@@ -63,6 +63,9 @@
#include <net/pkt_sched.h>
#include <linux/list.h>
#include <linux/reboot.h>
+#ifdef NETIF_F_TSO
+#include <net/checksum.h>
+#endif
#include <linux/tqueue.h>
#include <linux/mii.h>
#include <linux/ethtool.h>
@@ -131,6 +134,7 @@
uint64_t dma;
unsigned long length;
unsigned long time_stamp;
+ unsigned int next_to_watch;
};
struct e1000_desc_ring {
@@ -166,7 +170,6 @@
struct timer_list watchdog_timer;
struct timer_list phy_info_timer;
struct vlan_group *vlgrp;
- char *id_string;
uint32_t bd_number;
uint32_t rx_buffer_len;
uint32_t part_num;
@@ -215,9 +218,11 @@
struct e1000_phy_info phy_info;
struct e1000_phy_stats phy_stats;
+ uint32_t test_icr;
+ struct e1000_desc_ring test_tx_ring;
+ struct e1000_desc_ring test_rx_ring;
uint32_t pci_state[16];
- char ifname[IFNAMSIZ];
};
#endif /* _E1000_H_ */
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)