Revert "i40e: remove CONFIG_I40E_VXLAN"
authorSinghai, Anjali <anjali.singhai@intel.com>
Fri, 4 Dec 2015 07:49:31 +0000 (23:49 -0800)
committerDavid S. Miller <davem@davemloft.net>
Sun, 6 Dec 2015 16:23:30 +0000 (11:23 -0500)
commit6633d3815c099a0aaf28e4853f7a8994331b8c05
treeb80c89a83f47a54ced7059ff3a36fcf432cb389c
parentb48565f50bf33e738e8660f26594b2feb2ad61cc
Revert "i40e: remove CONFIG_I40E_VXLAN"

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>
drivers/net/ethernet/intel/Kconfig
drivers/net/ethernet/intel/i40e/i40e.h
drivers/net/ethernet/intel/i40e/i40e_main.c