From fdb0b48722fa1c6db0e752255300c20e6628df32 Mon Sep 17 00:00:00 2001 From: Dhananjay Phadke Date: Sun, 26 Jul 2009 20:17:21 -0700 Subject: [PATCH] --- yaml --- r: 155887 b: refs/heads/master c: c8a5a658b826508c7c61b57e9a590f7b8760fb51 h: refs/heads/master i: 155885: db516e506e5824d8ecd48d26cfd3afc5835a403f 155883: a414a7ded801d45993f521709b6c9de881d7f468 155879: 77e5a1530cb50dc66025b045cc0acfe4ceb5b58d 155871: 3193a96ad7df4b383ab4bf5bcadb3cc8eb3ab810 v: v3 --- [refs] | 2 +- trunk/drivers/net/netxen/netxen_nic_init.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index b1e44099b1a1..dbd3983d835f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c587aea951a56d29741a3cef4ea3e142c93b3207 +refs/heads/master: c8a5a658b826508c7c61b57e9a590f7b8760fb51 diff --git a/trunk/drivers/net/netxen/netxen_nic_init.c b/trunk/drivers/net/netxen/netxen_nic_init.c index 5d3343ef3d86..7acf204e38c9 100644 --- a/trunk/drivers/net/netxen/netxen_nic_init.c +++ b/trunk/drivers/net/netxen/netxen_nic_init.c @@ -184,6 +184,13 @@ 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;