i40evf: Rename i40e_ptype_lookup i40evf_ptype_lookup
authorEric W Biederman <ebiederm@xmission.com>
Tue, 18 Mar 2014 07:26:50 +0000 (00:26 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 18 Mar 2014 17:25:41 +0000 (13:25 -0400)
commit37a622c1931d6fb41b30c308b4f077cb8696b16a
tree234bfe64cd2eaa4f3d5782520d204a8a83761c90
parent72f72dcc146fd7c4f9a8544626b961d52f1399b3
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 206812b5fccb808d1194344eaa942f68f59b2630
  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>
drivers/net/ethernet/intel/i40evf/i40e_common.c
drivers/net/ethernet/intel/i40evf/i40e_prototype.h