]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Revert "i40e: remove CONFIG_I40E_VXLAN"
authorSinghai, Anjali <anjali.singhai@intel.com>
Fri, 4 Dec 2015 07:49:31 +0000 (23:49 -0800)
committerChuck Anderson <chuck.anderson@oracle.com>
Thu, 10 Mar 2016 16:36:34 +0000 (08:36 -0800)
commitc434c7a5a5069cce2955f34569d3b9d0a2f44f19
treec92a698fca3086dfe8bd805b686fb72e661de1ee
parent4c47a24f1fab40888f85f8e4aa369e6d5804fafe
Revert "i40e: remove CONFIG_I40E_VXLAN"

Orabug: 22342532

This reverts commit 8fe269991aece394a7ed274f525d96c73f94109a.
The case where VXLAN is a module and i40e driver is inbuilt
will not be handled properly with this change since i40e
will have an undefined symbol vxlan_get_rx_port in it.

v2: Add a signed-off-by.

Signed-off-by: Anjali Singhai Jain <anjali.singhai@intel.com>
Acked-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit 6633d3815c099a0aaf28e4853f7a8994331b8c05)
Signed-off-by: Brian Maly <brian.maly@oracle.com>
drivers/net/ethernet/intel/Kconfig
drivers/net/ethernet/intel/i40e/i40e.h
drivers/net/ethernet/intel/i40e/i40e_main.c