Re: [PATCH net-next ] i40evf: Rename i40e_ptype_lookup i40evf_ptype_lookup

[Jeff Kirsher <jeffrey.t.kirsher@intel.com>]

[-- Attachment #1: Type: text/plain, Size: 2421 bytes --]

On Fri, 2014-03-14 at 16:03 -0700, Eric W. Biederman wrote:
> 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>
> Date:   Wed Feb 12 01:45:33 2014 +0000
> 
>     i40e/i40evf: i40e implementation for skb_set_hash
> 
>     Original comment from Tom Herbert <therbert@google.com>
> 
>        Drivers should call skb_set_hash to set the hash and its type
>        in an skbuff.
> 
>     This patch builds upon Tom's original implementation and adds
>     the L4 type return when we know it is an L4 hash.
>     This requires use of the ptype decoder ring, so enable it.
> 
>     Change-ID: I2f9fa86d1a6add58cff13386f7f4238b1abcc468
>     CC: Tom Herbert <therbert@google.com>
>     Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
>     Acked-by: Shannon Nelson <shannon.nelson@intel.com>
>     Acked-by: Mitch Williams <mitch.a.williams@intel.com>
>     Signed-off-by: Catherine Sullivan <catherine.sullivan@intel.com>
>     Tested-by: Kavindya Deegala <kavindya.s.deegala@intel.com>
>     Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> 
> Cc: Jesse Brandeburg <jesse.brandeburg@intel.com>
> Cc: Catherine Sullivan <catherine.sullivan@intel.com>
> Cc: Kavindya Deegala <kavindya.s.deegala@intel.com>
> Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
> ---
>  drivers/net/ethernet/intel/i40evf/i40e_common.c    |    8 ++++----
>  drivers/net/ethernet/intel/i40evf/i40e_prototype.h |    4 ++--
>  2 files changed, 6 insertions(+), 6 deletions(-)

Correction, I guess I did not already have a fix for this in my queue,
so I have added this patch to my queue.  Thanks Eric!

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 819 bytes --]