Eric W Biederman 37a622c193 i40evf: Rename i40e_ptype_lookup i40evf_ptype_lookup ... When compiling the i40e and the i40evf driver into the same kernel I get: LD drivers/net/ethernet/intel/built-in.o drivers/net/ethernet/intel/i40evf/built-in.o:(.data+0x300): multiple definition of `i40e_ptype_lookup' drivers/net/ethernet/intel/i40e/built-in.o:(.data+0x780): first defined here make[3]: *** [drivers/net/ethernet/intel/built-in.o] Error 1 make[2]: *** [drivers/net/ethernet/intel] Error 2 make[1]: *** [drivers/net/ethernet/] Error 2 make: *** [sub-make] Error 2 Fix this by renaming the i40evf version of this structure from i40e_ptype_lookup to i40evf_ptype_lookup. This build failure was introduced in: commit 206812b5fc Author: Jesse Brandeburg <jesse.brandeburg@intel.com> i40e/i40evf: i40e implementation for skb_set_hash Cc: Jesse Brandeburg <jesse.brandeburg@intel.com> Cc: Catherine Sullivan <catherine.sullivan@intel.com> Signed-off-by: Eric W Biederman <ebiederm@xmission.com> Tested-by: Kavindya Deegala <kavindya.s.deegala@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>		2014-03-18 13:25:41 -04:00
..
3com	Drivers: net: ethernet: 3com: 3c589_cs fixed coding style issues	2014-02-18 16:59:46 -05:00
8390	net/apne: Remove unused variable ei_local	2014-01-26 22:40:43 -08:00
adaptec
adi	net: bfin_mac: do not reset PHY after phy_start()	2013-12-09 20:38:59 -05:00
aeroflex	drivers/net: delete non-required instances of include <linux/init.h>	2014-01-16 11:53:26 -08:00
allwinner	net: ethernet: sunxi: Add new compatibles	2014-02-06 19:46:54 -08:00
alteon	drivers/net: delete non-required instances of include <linux/init.h>	2014-01-16 11:53:26 -08:00
altera	Altera TSE: Add Altera Ethernet Driver Makefile and Kconfig	2014-03-17 21:26:57 -04:00
amd	amd8111e: Don't receive packets when the napi budget == 0	2014-03-14 22:52:47 -04:00
apple
arc	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-01-06 17:37:45 -05:00
atheros	alx: add missing stats_lock spinlock init	2014-02-10 17:50:35 -08:00
broadcom	bnx2x: Don't receive packets when the napi budget == 0	2014-03-14 22:52:47 -04:00
brocade	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-14 22:31:55 -04:00
cadence	net: macb: DMA-unmap full rx-buffer	2014-03-05 20:40:25 -05:00
calxeda	drivers/net: delete non-required instances of include <linux/init.h>	2014-01-16 11:53:26 -08:00
chelsio	cxgb4/iw_cxgb4: Doorbell Drop Avoidance Bug Fixes	2014-03-14 22:44:11 -04:00
cirrus	drivers/net: delete non-required instances of include <linux/init.h>	2014-01-16 11:53:26 -08:00
cisco	enic: Don't receive packets when the napi budget == 0	2014-03-14 22:52:47 -04:00
davicom	dm9000: fix a lot of checkpatch issues	2014-01-16 16:22:53 -08:00
dec	drivers/net: tulip_remove_one needs to call pci_disable_device()	2014-02-17 00:19:24 -05:00
dlink	drivers/net: delete non-required instances of include <linux/init.h>	2014-01-16 11:53:26 -08:00
emulex	net: Replace u64_stats_fetch_begin_bh to u64_stats_fetch_begin_irq	2014-03-14 22:41:36 -04:00
faraday	net: ftgmac100: use kfree_skb() where appropriate	2014-01-17 18:54:13 -08:00
freescale	fs_enet: Don't receive packets when the napi budget == 0	2014-03-14 22:52:47 -04:00
fujitsu	drivers/net: delete non-required instances of include <linux/init.h>	2014-01-16 11:53:26 -08:00
hp
i825xx	drivers/net: delete non-required instances of include <linux/init.h>	2014-01-16 11:53:26 -08:00
ibm	ibmveth: Don't receive packets when the napi budget == 0	2014-03-14 22:52:47 -04:00
icplus	drivers/net: delete non-required instances of include <linux/init.h>	2014-01-16 11:53:26 -08:00
intel	i40evf: Rename i40e_ptype_lookup i40evf_ptype_lookup	2014-03-18 13:25:41 -04:00
marvell	sky2: Don't receive packets when the napi budget == 0	2014-03-14 22:52:48 -04:00
mellanox	mlx4: Don't receive packets when the napi budget == 0	2014-03-14 22:52:48 -04:00
micrel	drivers/net: delete non-required instances of include <linux/init.h>	2014-01-16 11:53:26 -08:00
microchip
moxa	drivers/net: delete non-required instances of include <linux/init.h>	2014-01-16 11:53:26 -08:00
myricom	myri10ge: Use pci_enable_msix_range() instead of pci_enable_msix()	2014-02-18 15:33:32 -05:00
natsemi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2014-01-25 11:17:34 -08:00
neterion	vxge: Don't receive packets when the napi budget == 0	2014-03-14 22:52:48 -04:00
nuvoton
nvidia	net: Replace u64_stats_fetch_begin_bh to u64_stats_fetch_begin_irq	2014-03-14 22:41:36 -04:00
nxp	drivers/net: delete non-required instances of include <linux/init.h>	2014-01-16 11:53:26 -08:00
octeon
oki-semi	ethernet: Fix FSF address in file headers	2013-12-06 12:37:55 -05:00
packetengines	net: packetengines: slight optimization of addr	2013-12-31 16:48:32 -05:00
pasemi	drivers/net: delete non-required instances of include <linux/init.h>	2014-01-16 11:53:26 -08:00
qlogic	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-05 20:32:02 -05:00
rdc	r6040: use ETH_ZLEN instead of MISR for SKB length checking	2014-01-16 16:22:54 -08:00
realtek	net: Replace u64_stats_fetch_begin_bh to u64_stats_fetch_begin_irq	2014-03-14 22:41:36 -04:00
renesas	sh_eth: fold netif_msg_*() and netdev_*() calls into netif_*() invocations	2014-03-17 16:06:36 -04:00
seeq	drivers/net: delete non-required instances of include <linux/init.h>	2014-01-16 11:53:26 -08:00
sfc	sfc: Don't receive packets when the napi budget == 0	2014-03-14 22:52:48 -04:00
sgi	drivers/net: delete non-required instances of include <linux/init.h>	2014-01-16 11:53:26 -08:00
silan
sis	net: sis900: remove unnecessary pci_set_drvdata()	2013-12-09 18:09:28 -05:00
smsc	drivers/net: delete non-required instances of include <linux/init.h>	2014-01-16 11:53:26 -08:00
stmicro	stmmac: dwmac-sti: fix broken STiD127 compatibility	2014-03-11 16:14:31 -04:00
sun	niu: Use pci_enable_msix_range() instead of pci_enable_msix()	2014-02-18 15:33:34 -05:00
tehuti	net: Spelling s/transmition/transmission/	2014-01-14 17:11:26 -08:00
ti	net: eth: cpsw: Use net_device_stats from struct net_device	2014-03-10 21:53:01 -04:00
tile	tilepro: Don't receive packets when the napi budget == 0	2014-03-14 22:52:48 -04:00
toshiba	tc35815: Don't receive packets when the napi budget == 0	2014-03-14 22:52:48 -04:00
tundra	drivers/net: delete non-required instances of include <linux/init.h>	2014-01-16 11:53:26 -08:00
via	net: Replace u64_stats_fetch_begin_bh to u64_stats_fetch_begin_irq	2014-03-14 22:41:36 -04:00
wiznet	net: w5100: Use devm_ioremap_resource()	2014-02-28 16:57:24 -05:00
xilinx	xilinx: Convert uses of __constant_<foo> to <foo>	2014-03-12 15:28:06 -04:00
xircom	ethernet: Fix FSF address in file headers	2013-12-06 12:37:55 -05:00
xscale	ixp4xx_eth: Implement the SIOCGHWTSTAMP ioctl	2013-11-21 17:17:48 +00:00
dnet.c	drivers/net: delete non-required instances of include <linux/init.h>	2014-01-16 11:53:26 -08:00
dnet.h
ethoc.c	net: ethoc: set up MII management bus clock	2014-02-04 20:19:51 -08:00
fealnx.c
jme.c
jme.h
Kconfig	net: ethernet: Change Ethernet Makefile and Kconfig for Altera TSE driver	2014-03-17 21:26:57 -04:00
korina.c	drivers/net: delete non-required instances of include <linux/init.h>	2014-01-16 11:53:26 -08:00
lantiq_etop.c	netdevice: add queue selection fallback handler for ndo_select_queue	2014-02-17 00:36:34 -05:00
Makefile	net: ethernet: Change Ethernet Makefile and Kconfig for Altera TSE driver	2014-03-17 21:26:57 -04:00
netx-eth.c	ethernet: Fix FSF address in file headers	2013-12-06 12:37:55 -05:00
s6gmac.c	drivers/net: delete non-required instances of include <linux/init.h>	2014-01-16 11:53:26 -08:00