From: Dhananjay Phadke <dhananjay@netxen.com>
To: netdev@vger.kernel.org
Cc: davem@davemloft.net
Subject: [PATCH 07/13] netxen: cleanup mac list on driver unload
Date: Mon, 12 Jan 2009 11:23:05 -0800 [thread overview]
Message-ID: <1231788191-23794-8-git-send-email-dhananjay@netxen.com> (raw)
In-Reply-To: <1231788191-23794-1-git-send-email-dhananjay@netxen.com>
This fixes a tiny memory leak when driver is unloaded. The mac
address list maintained in netxen_adapter needs to deleted when
driver is going down.
Signed-off-by: Dhananjay Phadke <dhananjay@netxen.com>
---
drivers/net/netxen/netxen_nic.h | 1 +
drivers/net/netxen/netxen_nic_hw.c | 13 +++++++++++++
drivers/net/netxen/netxen_nic_main.c | 3 +++
3 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/drivers/net/netxen/netxen_nic.h b/drivers/net/netxen/netxen_nic.h
index 274d19f..abfcd8e 100644
--- a/drivers/net/netxen/netxen_nic.h
+++ b/drivers/net/netxen/netxen_nic.h
@@ -1487,6 +1487,7 @@ int netxen_process_cmd_ring(struct netxen_adapter *adapter);
u32 netxen_process_rcv_ring(struct netxen_adapter *adapter, int ctx, int max);
void netxen_p2_nic_set_multi(struct net_device *netdev);
void netxen_p3_nic_set_multi(struct net_device *netdev);
+void netxen_p3_free_mac_list(struct netxen_adapter *adapter);
int netxen_p3_nic_set_promisc(struct netxen_adapter *adapter, u32);
int netxen_config_intr_coalesce(struct netxen_adapter *adapter);
diff --git a/drivers/net/netxen/netxen_nic_hw.c b/drivers/net/netxen/netxen_nic_hw.c
index 5d69997..1ce3ab1 100644
--- a/drivers/net/netxen/netxen_nic_hw.c
+++ b/drivers/net/netxen/netxen_nic_hw.c
@@ -627,6 +627,19 @@ int netxen_p3_nic_set_promisc(struct netxen_adapter *adapter, u32 mode)
(struct cmd_desc_type0 *)&req, 1);
}
+void netxen_p3_free_mac_list(struct netxen_adapter *adapter)
+{
+ nx_mac_list_t *cur, *next;
+
+ cur = adapter->mac_list;
+
+ while (cur) {
+ next = cur->next;
+ kfree(cur);
+ cur = next;
+ }
+}
+
#define NETXEN_CONFIG_INTR_COALESCE 3
/*
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index d2b0c59..c0771f5 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -981,6 +981,9 @@ static void __devexit netxen_nic_remove(struct pci_dev *pdev)
netxen_free_hw_resources(adapter);
netxen_release_rx_buffers(adapter);
netxen_free_sw_resources(adapter);
+
+ if (NX_IS_REVISION_P3(adapter->ahw.revision_id))
+ netxen_p3_free_mac_list(adapter);
}
if (adapter->portnum == 0)
--
1.6.0.2
next prev parent reply other threads:[~2009-01-12 19:34 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-12 19:22 netxen: bugfixes and enhancements Dhananjay Phadke
2009-01-12 19:22 ` [PATCH 01/13] netxen: fix sparse in warnings Dhananjay Phadke
2009-01-12 19:23 ` [PATCH 02/13] netxen: fix endianness in firmware commands Dhananjay Phadke
2009-01-12 19:23 ` [PATCH 03/13] netxen: fix ipv6+vlan offload and tx cleanup Dhananjay Phadke
2009-01-12 19:23 ` [PATCH 04/13] netxen: fix link speed reporting for some boards Dhananjay Phadke
2009-01-12 19:23 ` [PATCH 05/13] netxen: download firmware from file Dhananjay Phadke
2009-01-12 19:23 ` [PATCH 06/13] netxen: advertise wake-on-lan support Dhananjay Phadke
2009-01-12 19:23 ` Dhananjay Phadke [this message]
2009-01-12 19:23 ` [PATCH 08/13] netxen: hold tx lock while sending firmware commands Dhananjay Phadke
2009-01-12 19:23 ` [PATCH 09/13] netxen: handle dma mapping failures Dhananjay Phadke
2009-01-12 19:23 ` [PATCH 10/13] netxen: misc code cleanup Dhananjay Phadke
2009-01-12 19:23 ` [PATCH 11/13] netxen: remove unnecessary header includes Dhananjay Phadke
2009-01-12 19:23 ` [PATCH 12/13] netxen: simplify dma mask setting Dhananjay Phadke
2009-01-12 19:23 ` [PATCH 13/13] netxen: raise version to 4.0.23 Dhananjay Phadke
2009-01-13 6:07 ` netxen: bugfixes and enhancements David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1231788191-23794-8-git-send-email-dhananjay@netxen.com \
--to=dhananjay@netxen.com \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).