From 9d0e4efba1b06c1c558b61ee13ae430b13a29c5e Mon Sep 17 00:00:00 2001
From: Jon Mason <jon.mason@exar.com>
Date: Thu, 12 Aug 2010 05:03:03 +0000
Subject: [PATCH] --- yaml --- r: 213832 b: refs/heads/master c:
 be265e9bae343d803145bbe910a8b00bc4bea3cc h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/net/s2io.c | 2 --
 trunk/drivers/net/s2io.h | 8 --------
 3 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index e0026944af57..4113c0aaf130 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: baeb2ffab4e67bb9174e6166e070a9a8ec94b0f6
+refs/heads/master: be265e9bae343d803145bbe910a8b00bc4bea3cc
diff --git a/trunk/drivers/net/s2io.c b/trunk/drivers/net/s2io.c
index 18bc5b718bbb..0124f1201d97 100644
--- a/trunk/drivers/net/s2io.c
+++ b/trunk/drivers/net/s2io.c
@@ -5124,8 +5124,6 @@ static void s2io_set_multicast(struct net_device *dev)
 		/* Create the new Rx filter list and update the same in H/W. */
 		i = 0;
 		netdev_for_each_mc_addr(ha, dev) {
-			memcpy(sp->usr_addrs[i].addr, ha->addr,
-			       ETH_ALEN);
 			mac_addr = 0;
 			for (j = 0; j < ETH_ALEN; j++) {
 				mac_addr |= ha->addr[j];
diff --git a/trunk/drivers/net/s2io.h b/trunk/drivers/net/s2io.h
index 0af033533905..924f618f2397 100644
--- a/trunk/drivers/net/s2io.h
+++ b/trunk/drivers/net/s2io.h
@@ -816,12 +816,6 @@ struct mac_info {
 	struct stat_block *stats_info;	/* Logical address of the stat block */
 };
 
-/* structure representing the user defined MAC addresses */
-struct usr_addr {
-	char addr[ETH_ALEN];
-	int usage_cnt;
-};
-
 /* Default Tunable parameters of the NIC. */
 #define DEFAULT_FIFO_0_LEN 4096
 #define DEFAULT_FIFO_1_7_LEN 512
@@ -894,9 +888,7 @@ struct s2io_nic {
 #define ALL_MULTI   2
 
 #define MAX_ADDRS_SUPPORTED 64
-	u16 usr_addr_count;
 	u16 mc_addr_count;
-	struct usr_addr usr_addrs[256];
 
 	u16 m_cast_flg;
 	u16 all_multi_pos;