Skip to content

Commit

Permalink
igb: Don't give VFs random MAC addresses
Browse files Browse the repository at this point in the history
If the user has not assigned a MAC address to a VM, then don't give it a
random one. Instead, just give it zeros and let it figure out what to do
with them.

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>
  • Loading branch information
Mitch A Williams authored and Jeff Kirsher committed Jan 28, 2013
1 parent aa19c29 commit 5ac6f91
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/net/ethernet/intel/igb/igb_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -5197,7 +5197,7 @@ static int igb_vf_configure(struct igb_adapter *adapter, int vf)
{
unsigned char mac_addr[ETH_ALEN];

eth_random_addr(mac_addr);
eth_zero_addr(mac_addr);
igb_set_vf_mac(adapter, vf, mac_addr);

return 0;
Expand Down Expand Up @@ -5550,9 +5550,9 @@ static void igb_vf_reset_event(struct igb_adapter *adapter, u32 vf)
{
unsigned char *vf_mac = adapter->vf_data[vf].vf_mac_addresses;

/* generate a new mac address as we were hotplug removed/added */
/* clear mac address as we were hotplug removed/added */
if (!(adapter->vf_data[vf].flags & IGB_VF_FLAG_PF_SET_MAC))
eth_random_addr(vf_mac);
eth_zero_addr(vf_mac);

/* process remaining reset events */
igb_vf_reset(adapter, vf);
Expand Down

0 comments on commit 5ac6f91

Please sign in to comment.