diff options
| author | Jiri Pirko <jiri@resnulli.us> | 2013-01-07 20:38:26 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-01-08 21:00:48 -0500 |
| commit | aaeb6cdfa5c07533c2cd6d2c381374c69f7db9dc (patch) | |
| tree | f6d51541dbee2d6e1810fd7b5e44d149b1a01750 /drivers/net/ethernet/intel/e1000 | |
| parent | 948b337e62ca96b6e7de06fdd5f6fe44769d7e9c (diff) | |
remove init of dev->perm_addr in drivers
perm_addr is initialized correctly in register_netdevice() so to init it in
drivers is no longer needed.
Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/intel/e1000')
| -rw-r--r-- | drivers/net/ethernet/intel/e1000/e1000_main.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c index 294da56b824c..b20fff134378 100644 --- a/drivers/net/ethernet/intel/e1000/e1000_main.c +++ b/drivers/net/ethernet/intel/e1000/e1000_main.c | |||
| @@ -1123,9 +1123,8 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
| 1123 | } | 1123 | } |
| 1124 | /* don't block initalization here due to bad MAC address */ | 1124 | /* don't block initalization here due to bad MAC address */ |
| 1125 | memcpy(netdev->dev_addr, hw->mac_addr, netdev->addr_len); | 1125 | memcpy(netdev->dev_addr, hw->mac_addr, netdev->addr_len); |
| 1126 | memcpy(netdev->perm_addr, hw->mac_addr, netdev->addr_len); | ||
| 1127 | 1126 | ||
| 1128 | if (!is_valid_ether_addr(netdev->perm_addr)) | 1127 | if (!is_valid_ether_addr(netdev->dev_addr)) |
| 1129 | e_err(probe, "Invalid MAC Address\n"); | 1128 | e_err(probe, "Invalid MAC Address\n"); |
| 1130 | 1129 | ||
| 1131 | 1130 | ||