diff options
| author |   Singhai, Anjali <anjali.singhai@intel.com> | 2015-12-03 23:49:31 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-12-06 11:23:30 -0500 |
| commit | 6633d3815c099a0aaf28e4853f7a8994331b8c05 (patch) | |
| tree | b80c89a83f47a54ced7059ff3a36fcf432cb389c /drivers/net/usb/qmi_wwan.c | |
| parent | Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue (diff) | |
| download | linux-dev-6633d3815c099a0aaf28e4853f7a8994331b8c05.tar.xz linux-dev-6633d3815c099a0aaf28e4853f7a8994331b8c05.zip | |
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>
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions