Re: [PATCH ethtool 1/5] ethtool-copy.h: sync with net

[Ben Hutchings <ben@decadent.org.uk>]

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

On Sun, 2015-01-25 at 15:51 +0200, Amir Vadai wrote:
> From: Eyal Grossman <eyalgr@mellanox.com>
> 
> This covers kernel changes up to:
> 
> commit 892311f66f2411b813ca631009356891a0c2b0a1
> Author: Eyal Perry <eyalpe@mellanox.com>
> Date:   Tue Dec 2 18:12:10 2014 +0200
> 
> 	ethtool: Support for configurable RSS hash function
> 
> Signed-off-by: Eyal Grossman <eyalgr@mellanox.com>
> Signed-off-by: Amir Vadai <amirv@mellanox.com>
> ---
>  ethtool-copy.h | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
>  1 file changed, 59 insertions(+), 8 deletions(-)
> 
> diff --git a/ethtool-copy.h b/ethtool-copy.h
> index 61b78fc..5f66d9c 100644
> --- a/ethtool-copy.h
> +++ b/ethtool-copy.h
> @@ -10,8 +10,8 @@
>   * Portions Copyright (C) Sun Microsystems 2008
>   */
>  
> -#ifndef _LINUX_ETHTOOL_H
> -#define _LINUX_ETHTOOL_H
> +#ifndef _UAPI_LINUX_ETHTOOL_H
> +#define _UAPI_LINUX_ETHTOOL_H
[...]

You've copied from include/uapi/linux/ethtool.h, which is not quite
right.  The include/uapi directory contains definitions shared with
userland, but the headers still need some processing (like removing the
_UAPI prefix from header guards).  You should use 'make headers_install'
to generate the userland version in usr/include/linux/ethtool.h.
Anyway, I've done that myself based on today's net tree.

Ben.

-- 
Ben Hutchings
Quantity is no substitute for quality, but it's the only one we've got.

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