Skip to content

GitLab

Commit 71b47080 authored by Antoine Kaufmann's avatar Antoine Kaufmann Committed by Hejing Li
Browse files

images/mqnic: fix for newer kernel version

parent 6bf47a10
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 6 deletions
images/mqnic/mqnic_netdev.c
View file @ 71b47080
...@@ -477,18 +477,16 @@ int mqnic_init_netdev(struct mqnic_dev *mdev, int port, u8 __iomem *hw_addr) ...@@ -477,18 +477,16 @@ int mqnic_init_netdev(struct mqnic_dev *mdev, int port, u8 __iomem *hw_addr)
netif_set_real_num_rx_queues(ndev, priv->rx_queue_count); netif_set_real_num_rx_queues(ndev, priv->rx_queue_count);
// set MAC // set MAC
ndev->addr_len = ETH_ALEN; if (!is_valid_ether_addr(mdev->base_mac))
memcpy(ndev->dev_addr, mdev->base_mac, ETH_ALEN);
if (!is_valid_ether_addr(ndev->dev_addr))
{ {
dev_warn(dev, "Bad MAC in EEPROM; using random MAC"); dev_warn(dev, "Bad MAC in EEPROM; using random MAC");
eth_hw_addr_random(ndev); eth_random_addr(mdev->base_mac);
} }
else else
{ {
ndev->dev_addr[ETH_ALEN-1] += port; mdev->base_mac[ETH_ALEN-1] += port;
} }
eth_hw_addr_set(ndev, mdev->base_mac);
priv->hwts_config.flags = 0; priv->hwts_config.flags = 0;
priv->hwts_config.tx_type = HWTSTAMP_TX_OFF; priv->hwts_config.tx_type = HWTSTAMP_TX_OFF;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment