From: David S. Miller Date: Wed, 15 Jan 2014 08:01:03 +0000 (-0800) Subject: Merge branch 'i40e-next' X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e3e4e01cb7c8b56b634fca53fcb05563c23fb656;p=linux-beck.git Merge branch 'i40e-next' Aaron Brown says: ==================== Intel Wired LAN Driver Updates This series contains updates to i40e from Greg Rose for VLAN filtering. Greg Rose (2): i40e: Warn admin to reload VF driver on port VLAN configuration. When an administrator sets a port VLAN filters for the virtual function (VF) after the VF has already set its own VLAN filters a conflict requiring the VF be reloaded can occur. This patch logs a message indicating to the system administrator that the VF driver must be reloaded for the new port VLAN settings to take effect i40e: Retain MAC filters on port VLAN deletion On port VLAN deletion the list of MAC filters for the virtual function (VF) VSI were all deleted. Let's keep them around, they come in handy for keeping the VF functional. ==================== Signed-off-by: David S. Miller --- e3e4e01cb7c8b56b634fca53fcb05563c23fb656