diff options
author | Jiri Pirko <jiri@resnulli.us> | 2012-12-31 22:30:15 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-01-04 01:37:35 -0500 |
commit | e41b2d7fe7803e85e1202d0eb172717d7bf1bbaf (patch) | |
tree | b389816be4d8a0d465afe8f18c8beecd1bd77834 /drivers/net/ethernet/atheros | |
parent | f652151640344f8faee21fcf702b4fd46b8fe70b (diff) |
net: set dev->addr_assign_type correctly
Not a bitfield, but a plain value.
Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/atheros')
-rw-r--r-- | drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/atheros/atlx/atl1.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c index 56d3f697e0c7..17651c779680 100644 --- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c +++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c | |||
@@ -2540,7 +2540,7 @@ static int atl1c_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
2540 | } | 2540 | } |
2541 | if (atl1c_read_mac_addr(&adapter->hw)) { | 2541 | if (atl1c_read_mac_addr(&adapter->hw)) { |
2542 | /* got a random MAC address, set NET_ADDR_RANDOM to netdev */ | 2542 | /* got a random MAC address, set NET_ADDR_RANDOM to netdev */ |
2543 | netdev->addr_assign_type |= NET_ADDR_RANDOM; | 2543 | netdev->addr_assign_type = NET_ADDR_RANDOM; |
2544 | } | 2544 | } |
2545 | memcpy(netdev->dev_addr, adapter->hw.mac_addr, netdev->addr_len); | 2545 | memcpy(netdev->dev_addr, adapter->hw.mac_addr, netdev->addr_len); |
2546 | memcpy(netdev->perm_addr, adapter->hw.mac_addr, netdev->addr_len); | 2546 | memcpy(netdev->perm_addr, adapter->hw.mac_addr, netdev->addr_len); |
diff --git a/drivers/net/ethernet/atheros/atlx/atl1.c b/drivers/net/ethernet/atheros/atlx/atl1.c index 71b3d7daa21d..5b0d9931c720 100644 --- a/drivers/net/ethernet/atheros/atlx/atl1.c +++ b/drivers/net/ethernet/atheros/atlx/atl1.c | |||
@@ -3053,7 +3053,7 @@ static int atl1_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
3053 | /* copy the MAC address out of the EEPROM */ | 3053 | /* copy the MAC address out of the EEPROM */ |
3054 | if (atl1_read_mac_addr(&adapter->hw)) { | 3054 | if (atl1_read_mac_addr(&adapter->hw)) { |
3055 | /* mark random mac */ | 3055 | /* mark random mac */ |
3056 | netdev->addr_assign_type |= NET_ADDR_RANDOM; | 3056 | netdev->addr_assign_type = NET_ADDR_RANDOM; |
3057 | } | 3057 | } |
3058 | memcpy(netdev->dev_addr, adapter->hw.mac_addr, netdev->addr_len); | 3058 | memcpy(netdev->dev_addr, adapter->hw.mac_addr, netdev->addr_len); |
3059 | 3059 | ||