mirror of https://gitee.com/openkylin/linux.git
igbvf: be sane about random MAC addresses
Tighten up some of the code surrounding MAC addresses. Since the PF is now giving all zeros instead of a random address, check for this case and generate a random address. This ensures that we always know when we have a random address and udev won't get upset about it. Additionally, tighten up some of the log messages and clean up the formatting. Signed-off-by: Mitch Williams <mitch.a.williams@intel.com> CC: Andy Gospodarek <andy@greyhouse.net> CC: Stefan Assmann <sassmann@kpanic.de> Tested-by: Aaron Brown <aaron.f.brown@intel.com> Tested-by: Stefan Assmann <sassmann@redhat.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
This commit is contained in:
parent
5ac6f91d39
commit
8d56b6d507
|
@ -2735,26 +2735,22 @@ static int igbvf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|||
err = hw->mac.ops.reset_hw(hw);
|
||||
if (err) {
|
||||
dev_info(&pdev->dev,
|
||||
"PF still in reset state, assigning new address."
|
||||
" Is the PF interface up?\n");
|
||||
eth_hw_addr_random(netdev);
|
||||
memcpy(adapter->hw.mac.addr, netdev->dev_addr,
|
||||
netdev->addr_len);
|
||||
"PF still in reset state. Is the PF interface up?\n");
|
||||
} else {
|
||||
err = hw->mac.ops.read_mac_addr(hw);
|
||||
if (err) {
|
||||
dev_err(&pdev->dev, "Error reading MAC address\n");
|
||||
goto err_hw_init;
|
||||
}
|
||||
if (err)
|
||||
dev_info(&pdev->dev, "Error reading MAC address.\n");
|
||||
else if (is_zero_ether_addr(adapter->hw.mac.addr))
|
||||
dev_info(&pdev->dev, "MAC address not assigned by administrator.\n");
|
||||
memcpy(netdev->dev_addr, adapter->hw.mac.addr,
|
||||
netdev->addr_len);
|
||||
}
|
||||
|
||||
if (!is_valid_ether_addr(netdev->dev_addr)) {
|
||||
dev_err(&pdev->dev, "Invalid MAC Address: %pM\n",
|
||||
netdev->dev_addr);
|
||||
err = -EIO;
|
||||
goto err_hw_init;
|
||||
dev_info(&pdev->dev, "Assigning random MAC address.\n");
|
||||
eth_hw_addr_random(netdev);
|
||||
memcpy(adapter->hw.mac.addr, netdev->dev_addr,
|
||||
netdev->addr_len);
|
||||
}
|
||||
|
||||
setup_timer(&adapter->watchdog_timer, &igbvf_watchdog,
|
||||
|
|
Loading…
Reference in New Issue