i40e: Cleanup i40e_vlan_rx_register
authorJacob Keller <jacob.e.keller@intel.com>
Thu, 8 Mar 2018 22:52:06 +0000 (14:52 -0800)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Wed, 14 Mar 2018 19:22:21 +0000 (12:22 -0700)
commit2972b00797588b5cfdd8369612cca8415a4e9e73
tree57ee40305a36207ecdf96f8ff45826f42722de1d
parent028daf80117376b22909becd9720daaefdfceff4
i40e: Cleanup i40e_vlan_rx_register

We used to use the function i40e_vlan_rx_register as a way to hook
into the now defunct .ndo_vlan_rx_register netdev hook. This was
removed but we kept the function around because we still used it
internally to control enabling or disabling of VLAN stripping.

As pointed out in upstream review, VLAN stripping is only used in a
single location and the previous function is quite small, just inline
it into i40e_restore_vlan() rather than carrying the function
separately.

Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/i40e/i40e_main.c