aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/wiznet
diff options
context:
space:
mode:
authorJiri Pirko <jiri@resnulli.us>2012-12-31 22:30:17 -0500
committerDavid S. Miller <davem@davemloft.net>2013-01-04 01:37:36 -0500
commit15c6ff3bc0ff3464a8c7efcdea09c86454571622 (patch)
treece49a0d1f0b5f4cd075d3df0875c0bf0a44ee4ad /drivers/net/ethernet/wiznet
parentfbdeca2d7753aa1ab929aeb77ccc46489eed02b9 (diff)
net: remove unnecessary NET_ADDR_RANDOM "bitclean"
NET_ADDR_SET is set in dev_set_mac_address() no need to alter dev->addr_assign_type value in drivers. Signed-off-by: Jiri Pirko <jiri@resnulli.us> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/wiznet')
-rw-r--r--drivers/net/ethernet/wiznet/w5100.c1
-rw-r--r--drivers/net/ethernet/wiznet/w5300.c1
2 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/ethernet/wiznet/w5100.c b/drivers/net/ethernet/wiznet/w5100.c
index 352383890326..545043cc4c0b 100644
--- a/drivers/net/ethernet/wiznet/w5100.c
+++ b/drivers/net/ethernet/wiznet/w5100.c
@@ -570,7 +570,6 @@ static int w5100_set_macaddr(struct net_device *ndev, void *addr)
570 if (!is_valid_ether_addr(sock_addr->sa_data)) 570 if (!is_valid_ether_addr(sock_addr->sa_data))
571 return -EADDRNOTAVAIL; 571 return -EADDRNOTAVAIL;
572 memcpy(ndev->dev_addr, sock_addr->sa_data, ETH_ALEN); 572 memcpy(ndev->dev_addr, sock_addr->sa_data, ETH_ALEN);
573 ndev->addr_assign_type &= ~NET_ADDR_RANDOM;
574 w5100_write_macaddr(priv); 573 w5100_write_macaddr(priv);
575 return 0; 574 return 0;
576} 575}
diff --git a/drivers/net/ethernet/wiznet/w5300.c b/drivers/net/ethernet/wiznet/w5300.c
index 9d1d986f8d40..7cbd0e6fc6f3 100644
--- a/drivers/net/ethernet/wiznet/w5300.c
+++ b/drivers/net/ethernet/wiznet/w5300.c
@@ -490,7 +490,6 @@ static int w5300_set_macaddr(struct net_device *ndev, void *addr)
490 if (!is_valid_ether_addr(sock_addr->sa_data)) 490 if (!is_valid_ether_addr(sock_addr->sa_data))
491 return -EADDRNOTAVAIL; 491 return -EADDRNOTAVAIL;
492 memcpy(ndev->dev_addr, sock_addr->sa_data, ETH_ALEN); 492 memcpy(ndev->dev_addr, sock_addr->sa_data, ETH_ALEN);
493 ndev->addr_assign_type &= ~NET_ADDR_RANDOM;
494 w5300_write_macaddr(priv); 493 w5300_write_macaddr(priv);
495 return 0; 494 return 0;
496} 495}