From 7e443f5e1dc7177b7f70bb81bd68521c4e121e5c Mon Sep 17 00:00:00 2001 From: Stefan Assmann Date: Mon, 26 Jul 2010 23:24:50 +0000 Subject: [PATCH] --- yaml --- r: 203766 b: refs/heads/master c: 2c6952dfdda2f266f2f501792b8d6413caf25f7a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/igbvf/netdev.c | 2 +- trunk/drivers/net/ixgbevf/ixgbevf_main.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 60652644aaa1..fa4519fb82fd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 56075a98dfb887981ee0e4b6a768cd53f2514f4c +refs/heads/master: 2c6952dfdda2f266f2f501792b8d6413caf25f7a diff --git a/trunk/drivers/net/igbvf/netdev.c b/trunk/drivers/net/igbvf/netdev.c index 5e2b2a8c56c6..048595bc79ad 100644 --- a/trunk/drivers/net/igbvf/netdev.c +++ b/trunk/drivers/net/igbvf/netdev.c @@ -2751,7 +2751,7 @@ static int __devinit igbvf_probe(struct pci_dev *pdev, dev_info(&pdev->dev, "PF still in reset state, assigning new address." " Is the PF interface up?\n"); - random_ether_addr(hw->mac.addr); + dev_hw_addr_random(adapter->netdev, hw->mac.addr); } else { err = hw->mac.ops.read_mac_addr(hw); if (err) { diff --git a/trunk/drivers/net/ixgbevf/ixgbevf_main.c b/trunk/drivers/net/ixgbevf/ixgbevf_main.c index af491352b5e0..4867440ecfa8 100644 --- a/trunk/drivers/net/ixgbevf/ixgbevf_main.c +++ b/trunk/drivers/net/ixgbevf/ixgbevf_main.c @@ -2229,7 +2229,7 @@ static int __devinit ixgbevf_sw_init(struct ixgbevf_adapter *adapter) if (err) { dev_info(&pdev->dev, "PF still in reset state, assigning new address\n"); - random_ether_addr(hw->mac.addr); + dev_hw_addr_random(adapter->netdev, hw->mac.addr); } else { err = hw->mac.ops.init_hw(hw); if (err) {