Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37a622c1 authored by Eric W Biederman's avatar Eric W Biederman Committed by David S. Miller
Browse files

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 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>
parent 72f72dcc

drivers/net/ethernet/intel/i40evf/i40e_common.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -160,7 +160,7 @@ i40e_status i40evf_aq_queue_shutdown(struct i40e_hw *hw, 
}

}









/* The i40e_ptype_lookup table is used to convert from the 8-bit ptype in the

/* The i40evf_ptype_lookup table is used to convert from the 8-bit ptype in the

 * hardware to a bit-field that can be used by SW to more easily determine the

 * hardware to a bit-field that can be used by SW to more easily determine the

 * packet type.

 * packet type.

 *

 *
@@ -173,10 +173,10 @@ i40e_status i40evf_aq_queue_shutdown(struct i40e_hw *hw, 
 *

 *

 * Typical work flow:

 * Typical work flow:

 *

 *

 * IF NOT i40e_ptype_lookup[ptype].known

 * IF NOT i40evf_ptype_lookup[ptype].known

 * THEN

 * THEN

 *      Packet is unknown

 *      Packet is unknown

 * ELSE IF i40e_ptype_lookup[ptype].outer_ip == I40E_RX_PTYPE_OUTER_IP

 * ELSE IF i40evf_ptype_lookup[ptype].outer_ip == I40E_RX_PTYPE_OUTER_IP

 *      Use the rest of the fields to look at the tunnels, inner protocols, etc

 *      Use the rest of the fields to look at the tunnels, inner protocols, etc

 * ELSE

 * ELSE

 *      Use the enum i40e_rx_l2_ptype to decode the packet type

 *      Use the enum i40e_rx_l2_ptype to decode the packet type
@@ -205,7 +205,7 @@ i40e_status i40evf_aq_queue_shutdown(struct i40e_hw *hw, 
#define I40E_RX_PTYPE_INNER_PROT_TS	I40E_RX_PTYPE_INNER_PROT_TIMESYNC

#define I40E_RX_PTYPE_INNER_PROT_TS	I40E_RX_PTYPE_INNER_PROT_TIMESYNC





/* Lookup table mapping the HW PTYPE to the bit field for decoding */

/* Lookup table mapping the HW PTYPE to the bit field for decoding */

struct i40e_rx_ptype_decoded i40e_ptype_lookup[] = {

struct i40e_rx_ptype_decoded i40evf_ptype_lookup[] = {

	/* L2 Packet types */

	/* L2 Packet types */

	I40E_PTT_UNUSED_ENTRY(0),

	I40E_PTT_UNUSED_ENTRY(0),

	I40E_PTT(1,  L2, NONE, NOF, NONE, NONE, NOF, NONE, PAY2),

	I40E_PTT(1,  L2, NONE, NOF, NONE, NONE, NOF, NONE, PAY2),

drivers/net/ethernet/intel/i40evf/i40e_prototype.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -63,11 +63,11 @@ i40e_status i40evf_aq_queue_shutdown(struct i40e_hw *hw, 




i40e_status i40e_set_mac_type(struct i40e_hw *hw);

i40e_status i40e_set_mac_type(struct i40e_hw *hw);





extern struct i40e_rx_ptype_decoded i40e_ptype_lookup[];

extern struct i40e_rx_ptype_decoded i40evf_ptype_lookup[];





static inline struct i40e_rx_ptype_decoded decode_rx_desc_ptype(u8 ptype)

static inline struct i40e_rx_ptype_decoded decode_rx_desc_ptype(u8 ptype)

{

{

	return  i40e_ptype_lookup[ptype];

	return  i40evf_ptype_lookup[ptype];

}

}





/* prototype for functions used for SW locks */

/* prototype for functions used for SW locks */