[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1428195613.11260.111.camel@decadent.org.uk>
Date: Sun, 05 Apr 2015 02:00:13 +0100
From: Ben Hutchings <ben@...adent.org.uk>
To: Amir Vadai <amirv@...lanox.com>
Cc: netdev@...r.kernel.org, Or Gerlitz <ogerlitz@...lanox.com>,
Yevgeny Petrilin <yevgenyp@...lanox.com>,
Saeed Mahameed <saeedm@...lanox.com>,
Eyal Perry <eyalpe@...lanox.com>,
Eyal Grossman <eyalgr@...lanox.com>
Subject: Re: [PATCH ethtool 1/5] ethtool-copy.h: sync with net
On Sun, 2015-01-25 at 15:51 +0200, Amir Vadai wrote:
> From: Eyal Grossman <eyalgr@...lanox.com>
>
> This covers kernel changes up to:
>
> commit 892311f66f2411b813ca631009356891a0c2b0a1
> Author: Eyal Perry <eyalpe@...lanox.com>
> Date: Tue Dec 2 18:12:10 2014 +0200
>
> ethtool: Support for configurable RSS hash function
>
> Signed-off-by: Eyal Grossman <eyalgr@...lanox.com>
> Signed-off-by: Amir Vadai <amirv@...lanox.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.
Download attachment "signature.asc" of type "application/pgp-signature" (812 bytes)
Powered by blists - more mailing lists