mirror_ubuntu-kernels/drivers/net/ethernet/intel/i40evf
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
..
i40e_adminq_cmd.h i40evf: remove errant space 2014-02-21 12:38:26 -05:00
i40e_adminq.c i40evf: init code and hardware support 2013-12-31 16:18:25 -08:00
i40e_adminq.h i40evf: init code and hardware support 2013-12-31 16:18:25 -08:00
i40e_alloc.h i40evf: init code and hardware support 2013-12-31 16:18:25 -08:00
i40e_common.c i40evf: Rename i40e_ptype_lookup i40evf_ptype_lookup 2014-03-18 13:25:41 -04:00
i40e_hmc.h i40evf: init code and hardware support 2013-12-31 16:18:25 -08:00
i40e_lan_hmc.h i40evf: A0 silicon specific 2013-12-31 16:39:42 -08:00
i40e_osdep.h i40evf: driver core headers 2013-12-31 16:09:05 -08:00
i40e_prototype.h i40evf: Rename i40e_ptype_lookup i40evf_ptype_lookup 2014-03-18 13:25:41 -04:00
i40e_register.h i40evf: A0 silicon specific 2013-12-31 16:39:42 -08:00
i40e_status.h i40evf: init code and hardware support 2013-12-31 16:18:25 -08:00
i40e_txrx.c i40e/i40evf: carefully fill tx ring 2014-03-06 18:42:05 -08:00
i40e_txrx.h i40evf: driver core headers 2013-12-31 16:09:05 -08:00
i40e_type.h i40e/i40evf: Some flow director HW definition fixes 2014-03-14 16:29:15 -07:00
i40e_virtchnl.h i40evf: virtual channel interface 2013-12-31 16:01:28 -08:00
i40evf_ethtool.c i40evf: store ring size in ring structs 2014-02-21 12:38:25 -05:00
i40evf_main.c i40e/i40evf: Use dma_set_mask_and_coherent 2014-03-14 16:30:05 -07:00
i40evf_virtchnl.c i40evf: request reset on tx hang 2014-02-21 12:38:25 -05:00
i40evf.h i40evf: store ring size in ring structs 2014-02-21 12:38:25 -05:00
Makefile i40evf: add driver to kernel build system 2013-12-31 16:27:49 -08:00