diff options
author | Jiri Pirko <jiri@resnulli.us> | 2012-12-31 22:30:17 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-01-04 01:37:36 -0500 |
commit | 15c6ff3bc0ff3464a8c7efcdea09c86454571622 (patch) | |
tree | ce49a0d1f0b5f4cd075d3df0875c0bf0a44ee4ad /drivers/net/ethernet/micrel | |
parent | fbdeca2d7753aa1ab929aeb77ccc46489eed02b9 (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/micrel')
-rw-r--r-- | drivers/net/ethernet/micrel/ks8842.c | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/micrel/ks8851.c | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/micrel/ks8851_mll.c | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/ethernet/micrel/ks8842.c b/drivers/net/ethernet/micrel/ks8842.c index b71eb39ab448..fbcb9e74d7fc 100644 --- a/drivers/net/ethernet/micrel/ks8842.c +++ b/drivers/net/ethernet/micrel/ks8842.c | |||
@@ -1080,7 +1080,6 @@ static int ks8842_set_mac(struct net_device *netdev, void *p) | |||
1080 | if (!is_valid_ether_addr(addr->sa_data)) | 1080 | if (!is_valid_ether_addr(addr->sa_data)) |
1081 | return -EADDRNOTAVAIL; | 1081 | return -EADDRNOTAVAIL; |
1082 | 1082 | ||
1083 | netdev->addr_assign_type &= ~NET_ADDR_RANDOM; | ||
1084 | memcpy(netdev->dev_addr, mac, netdev->addr_len); | 1083 | memcpy(netdev->dev_addr, mac, netdev->addr_len); |
1085 | 1084 | ||
1086 | ks8842_write_mac_addr(adapter, mac); | 1085 | ks8842_write_mac_addr(adapter, mac); |
diff --git a/drivers/net/ethernet/micrel/ks8851.c b/drivers/net/ethernet/micrel/ks8851.c index 286816a4e783..d59bc0e151b3 100644 --- a/drivers/net/ethernet/micrel/ks8851.c +++ b/drivers/net/ethernet/micrel/ks8851.c | |||
@@ -1052,7 +1052,6 @@ static int ks8851_set_mac_address(struct net_device *dev, void *addr) | |||
1052 | if (!is_valid_ether_addr(sa->sa_data)) | 1052 | if (!is_valid_ether_addr(sa->sa_data)) |
1053 | return -EADDRNOTAVAIL; | 1053 | return -EADDRNOTAVAIL; |
1054 | 1054 | ||
1055 | dev->addr_assign_type &= ~NET_ADDR_RANDOM; | ||
1056 | memcpy(dev->dev_addr, sa->sa_data, ETH_ALEN); | 1055 | memcpy(dev->dev_addr, sa->sa_data, ETH_ALEN); |
1057 | return ks8851_write_mac_addr(dev); | 1056 | return ks8851_write_mac_addr(dev); |
1058 | } | 1057 | } |
diff --git a/drivers/net/ethernet/micrel/ks8851_mll.c b/drivers/net/ethernet/micrel/ks8851_mll.c index ef8f9f92e547..a343066f7b43 100644 --- a/drivers/net/ethernet/micrel/ks8851_mll.c +++ b/drivers/net/ethernet/micrel/ks8851_mll.c | |||
@@ -1237,7 +1237,6 @@ static int ks_set_mac_address(struct net_device *netdev, void *paddr) | |||
1237 | struct sockaddr *addr = paddr; | 1237 | struct sockaddr *addr = paddr; |
1238 | u8 *da; | 1238 | u8 *da; |
1239 | 1239 | ||
1240 | netdev->addr_assign_type &= ~NET_ADDR_RANDOM; | ||
1241 | memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len); | 1240 | memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len); |
1242 | 1241 | ||
1243 | da = (u8 *)netdev->dev_addr; | 1242 | da = (u8 *)netdev->dev_addr; |