Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 351712
b: refs/heads/master
c: 5ac6f91
h: refs/heads/master
v: v3
  • Loading branch information
Mitch A Williams authored and Jeff Kirsher committed Jan 28, 2013
1 parent b8e58d6 commit c6a5625
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: aa19c2957b425f724efe93f2d5a5858b8aa613d7
refs/heads/master: 5ac6f91d39e0884813dc010e14552143cd1d0d8b
6 changes: 3 additions & 3 deletions trunk/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 c6a5625

Please sign in to comment.