From bdf874075860710be0b96a949522291f64be751d Mon Sep 17 00:00:00 2001 From: Ajit Khaparde Date: Wed, 7 Oct 2009 02:45:34 +0000 Subject: [PATCH] --- yaml --- r: 170485 b: refs/heads/master c: 5a4d631154de41bb43eefb03d2124224c23c1fa4 h: refs/heads/master i: 170483: c7ddda15d3a3011443a271df8aa745f22cf1f681 v: v3 --- [refs] | 2 +- trunk/drivers/net/netxen/netxen_nic.h | 2 -- trunk/drivers/net/netxen/netxen_nic_main.c | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index e8abfe26a6f5..40c747867b97 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7274c20f7b6a7bd6e3e8441e1727bf9cfd8235bb +refs/heads/master: 5a4d631154de41bb43eefb03d2124224c23c1fa4 diff --git a/trunk/drivers/net/netxen/netxen_nic.h b/trunk/drivers/net/netxen/netxen_nic.h index 7384f59df615..5c766b52f1dc 100644 --- a/trunk/drivers/net/netxen/netxen_nic.h +++ b/trunk/drivers/net/netxen/netxen_nic.h @@ -1203,8 +1203,6 @@ struct netxen_adapter { struct work_struct tx_timeout_task; - struct net_device_stats net_stats; - nx_nic_intr_coalesce_t coal; unsigned long state; diff --git a/trunk/drivers/net/netxen/netxen_nic_main.c b/trunk/drivers/net/netxen/netxen_nic_main.c index b5aa974827e5..0039b85d4d53 100644 --- a/trunk/drivers/net/netxen/netxen_nic_main.c +++ b/trunk/drivers/net/netxen/netxen_nic_main.c @@ -1923,7 +1923,7 @@ static void netxen_tx_timeout_task(struct work_struct *work) struct net_device_stats *netxen_nic_get_stats(struct net_device *netdev) { struct netxen_adapter *adapter = netdev_priv(netdev); - struct net_device_stats *stats = &adapter->net_stats; + struct net_device_stats *stats = &netdev->stats; memset(stats, 0, sizeof(*stats));