summaryrefslogtreecommitdiffstats
path: root/drivers/net/netxen/netxen_nic_init.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-08-13 19:59:44 -0700
committerDavid S. Miller <davem@davemloft.net>2009-08-13 19:59:44 -0700
commit5c16807d3d196203d2d3c9fae51ac7e422091904 (patch)
tree850c33533f80fe426b477c4660c61ba22315a808 /drivers/net/netxen/netxen_nic_init.c
parente5e2a8fd8358d1b3a2c51c3248edee72e4194703 (diff)
parent232e7d68d50c9ac3a55d716e5ae215ecd1e043b9 (diff)
downloadlinux-5c16807d3d196203d2d3c9fae51ac7e422091904.tar.gz
linux-5c16807d3d196203d2d3c9fae51ac7e422091904.tar.bz2
linux-5c16807d3d196203d2d3c9fae51ac7e422091904.zip
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/netxen/netxen_nic_main.c
Diffstat (limited to 'drivers/net/netxen/netxen_nic_init.c')
-rw-r--r--drivers/net/netxen/netxen_nic_init.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/net/netxen/netxen_nic_init.c b/drivers/net/netxen/netxen_nic_init.c
index 582828756ef4..e8bdbf9fefbb 100644
--- a/drivers/net/netxen/netxen_nic_init.c
+++ b/drivers/net/netxen/netxen_nic_init.c
@@ -184,13 +184,6 @@ void netxen_free_sw_resources(struct netxen_adapter *adapter)
kfree(recv_ctx->rds_rings);
skip_rds:
- if (recv_ctx->sds_rings == NULL)
- goto skip_sds;
-
- for(ring = 0; ring < adapter->max_sds_rings; ring++)
- recv_ctx->sds_rings[ring].consumer = 0;
-
-skip_sds:
if (adapter->tx_ring == NULL)
return;