aboutsummaryrefslogtreecommitdiffstats
path: root/net/kcm
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2018-01-24 18:02:17 -0500
committerDavid S. Miller <davem@davemloft.net>2018-01-24 18:02:17 -0500
commitbe1b6e8b5470e8311bfa1a3dfd7bd59e85a99759 (patch)
treebd9781e6686293b4cceeb6ee0b01ae517332bab8 /net/kcm
parentcxgb4: make symbol pedits static (diff)
parentfm10k: clarify action when updating the VLAN table (diff)
downloadlinux-dev-be1b6e8b5470e8311bfa1a3dfd7bd59e85a99759.tar.xz
linux-dev-be1b6e8b5470e8311bfa1a3dfd7bd59e85a99759.zip
Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue
Jeff Kirsher says: ==================== 100GbE Intel Wired LAN Driver Updates 2018-01-24 This series contains updates to fm10k only. Alex fixes MACVLAN offload for fm10k, where we were not seeing unicast packets being received because we did not correctly configure the default VLAN ID for the port and defaulting to 0. Jake cleans up unnecessary parenthesis in a couple of "if" statements. Fixed the driver to stop adding VLAN 0 into the VLAN table, since it would cause the VLAN table to be inconsistent between the PF and VF. Also fixed an issue where we were assuming that VLAN 1 is enabled when the default VLAN ID is not set, so resolve by not requesting any filters for the default_vid if it has not yet been assigned. Ngai fixes an issue which was generating a dmesg regarding unbale to kill a particular VLAN ID for the device. This is due to ndo_vlan_rx_kill_vid() exits with an error and the handler for this ndo is fm10k_update_vid() which exits prematurely under PF VLAN management. So to resolve, we must check the VLAN update action type before exiting fm10k_update_vid(), and act appropriately based on the action type. Also corrected code comment typos. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/kcm')
0 files changed, 0 insertions, 0 deletions