• Eric W Biederman's avatar
    i40evf: Rename i40e_ptype_lookup i40evf_ptype_lookup · 37a622c1
    Eric W Biederman authored
    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 206812b5
      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: default avatarEric W Biederman <ebiederm@xmission.com>
    Tested-by: default avatarKavindya Deegala <kavindya.s.deegala@intel.com>
    Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
    Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    37a622c1
i40e_common.c 21.7 KB