diff options
| -rw-r--r-- | drivers/net/ethernet/intel/i40evf/i40evf_main.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c b/drivers/net/ethernet/intel/i40evf/i40evf_main.c index 1c2ee97d1844..802e158ea981 100644 --- a/drivers/net/ethernet/intel/i40evf/i40evf_main.c +++ b/drivers/net/ethernet/intel/i40evf/i40evf_main.c | |||
| @@ -1858,6 +1858,7 @@ static int i40evf_open(struct net_device *netdev) | |||
| 1858 | if (err) | 1858 | if (err) |
| 1859 | goto err_req_irq; | 1859 | goto err_req_irq; |
| 1860 | 1860 | ||
| 1861 | i40evf_add_filter(adapter, adapter->hw.mac.addr); | ||
| 1861 | i40evf_configure(adapter); | 1862 | i40evf_configure(adapter); |
| 1862 | 1863 | ||
| 1863 | err = i40evf_up_complete(adapter); | 1864 | err = i40evf_up_complete(adapter); |
| @@ -1998,7 +1999,6 @@ static void i40evf_init_task(struct work_struct *work) | |||
| 1998 | struct i40evf_adapter, | 1999 | struct i40evf_adapter, |
| 1999 | init_task.work); | 2000 | init_task.work); |
| 2000 | struct net_device *netdev = adapter->netdev; | 2001 | struct net_device *netdev = adapter->netdev; |
| 2001 | struct i40evf_mac_filter *f; | ||
| 2002 | struct i40e_hw *hw = &adapter->hw; | 2002 | struct i40e_hw *hw = &adapter->hw; |
| 2003 | struct pci_dev *pdev = adapter->pdev; | 2003 | struct pci_dev *pdev = adapter->pdev; |
| 2004 | int i, err, bufsz; | 2004 | int i, err, bufsz; |
| @@ -2132,16 +2132,6 @@ static void i40evf_init_task(struct work_struct *work) | |||
| 2132 | ether_addr_copy(netdev->dev_addr, adapter->hw.mac.addr); | 2132 | ether_addr_copy(netdev->dev_addr, adapter->hw.mac.addr); |
| 2133 | ether_addr_copy(netdev->perm_addr, adapter->hw.mac.addr); | 2133 | ether_addr_copy(netdev->perm_addr, adapter->hw.mac.addr); |
| 2134 | 2134 | ||
| 2135 | f = kzalloc(sizeof(*f), GFP_ATOMIC); | ||
| 2136 | if (!f) | ||
| 2137 | goto err_sw_init; | ||
| 2138 | |||
| 2139 | ether_addr_copy(f->macaddr, adapter->hw.mac.addr); | ||
| 2140 | f->add = true; | ||
| 2141 | adapter->aq_required |= I40EVF_FLAG_AQ_ADD_MAC_FILTER; | ||
| 2142 | |||
| 2143 | list_add(&f->list, &adapter->mac_filter_list); | ||
| 2144 | |||
| 2145 | init_timer(&adapter->watchdog_timer); | 2135 | init_timer(&adapter->watchdog_timer); |
| 2146 | adapter->watchdog_timer.function = &i40evf_watchdog_timer; | 2136 | adapter->watchdog_timer.function = &i40evf_watchdog_timer; |
| 2147 | adapter->watchdog_timer.data = (unsigned long)adapter; | 2137 | adapter->watchdog_timer.data = (unsigned long)adapter; |
