diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/s2io.c | 2 | ||||
-rw-r--r-- | drivers/net/s2io.h | 8 |
2 files changed, 0 insertions, 10 deletions
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c index 18bc5b718bbb..0124f1201d97 100644 --- a/drivers/net/s2io.c +++ b/drivers/net/s2io.c | |||
@@ -5124,8 +5124,6 @@ static void s2io_set_multicast(struct net_device *dev) | |||
5124 | /* Create the new Rx filter list and update the same in H/W. */ | 5124 | /* Create the new Rx filter list and update the same in H/W. */ |
5125 | i = 0; | 5125 | i = 0; |
5126 | netdev_for_each_mc_addr(ha, dev) { | 5126 | netdev_for_each_mc_addr(ha, dev) { |
5127 | memcpy(sp->usr_addrs[i].addr, ha->addr, | ||
5128 | ETH_ALEN); | ||
5129 | mac_addr = 0; | 5127 | mac_addr = 0; |
5130 | for (j = 0; j < ETH_ALEN; j++) { | 5128 | for (j = 0; j < ETH_ALEN; j++) { |
5131 | mac_addr |= ha->addr[j]; | 5129 | mac_addr |= ha->addr[j]; |
diff --git a/drivers/net/s2io.h b/drivers/net/s2io.h index 0af033533905..924f618f2397 100644 --- a/drivers/net/s2io.h +++ b/drivers/net/s2io.h | |||
@@ -816,12 +816,6 @@ struct mac_info { | |||
816 | struct stat_block *stats_info; /* Logical address of the stat block */ | 816 | struct stat_block *stats_info; /* Logical address of the stat block */ |
817 | }; | 817 | }; |
818 | 818 | ||
819 | /* structure representing the user defined MAC addresses */ | ||
820 | struct usr_addr { | ||
821 | char addr[ETH_ALEN]; | ||
822 | int usage_cnt; | ||
823 | }; | ||
824 | |||
825 | /* Default Tunable parameters of the NIC. */ | 819 | /* Default Tunable parameters of the NIC. */ |
826 | #define DEFAULT_FIFO_0_LEN 4096 | 820 | #define DEFAULT_FIFO_0_LEN 4096 |
827 | #define DEFAULT_FIFO_1_7_LEN 512 | 821 | #define DEFAULT_FIFO_1_7_LEN 512 |
@@ -894,9 +888,7 @@ struct s2io_nic { | |||
894 | #define ALL_MULTI 2 | 888 | #define ALL_MULTI 2 |
895 | 889 | ||
896 | #define MAX_ADDRS_SUPPORTED 64 | 890 | #define MAX_ADDRS_SUPPORTED 64 |
897 | u16 usr_addr_count; | ||
898 | u16 mc_addr_count; | 891 | u16 mc_addr_count; |
899 | struct usr_addr usr_addrs[256]; | ||
900 | 892 | ||
901 | u16 m_cast_flg; | 893 | u16 m_cast_flg; |
902 | u16 all_multi_pos; | 894 | u16 all_multi_pos; |