Skip to content

Commit

Permalink
s2io: remove unused code
Browse files Browse the repository at this point in the history
usr_addrs is never referenced outside the initial struct population
during open, thus making it unnecessary.  Remove it, the code that
references it, and the struct that it is the only user of.

Signed-off-by: Jon Mason <jon.mason@exar.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Jon Mason authored and David S. Miller committed Aug 18, 2010
1 parent baeb2ff commit be265e9
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 10 deletions.
2 changes: 0 additions & 2 deletions drivers/net/s2io.c
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down
8 changes: 0 additions & 8 deletions drivers/net/s2io.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit be265e9

Please sign in to comment.