[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1292042650.3136.20.camel@localhost>
Date: Sat, 11 Dec 2010 04:44:10 +0000
From: Ben Hutchings <bhutchings@...arflare.com>
To: Simon Horman <horms@...ge.net.au>
Cc: netdev@...r.kernel.org, Eric Dumazet <eric.dumazet@...il.com>
Subject: Re: [PATCH] rfc: ethtool: early-orphan control (user-space)
On Sat, 2010-12-11 at 13:13 +0900, Simon Horman wrote:
[...]
> diff --git a/ethtool.c b/ethtool.c
> index 239912b..579b4e4 100644
> --- a/ethtool.c
> +++ b/ethtool.c
> @@ -163,7 +163,8 @@ static struct option {
> " [ xcvr internal|external ]\n"
> " [ wol p|u|m|b|a|g|s|d... ]\n"
> " [ sopass %x:%x:%x:%x:%x:%x ]\n"
> - " [ msglvl %d | msglvl type on|off ... ]\n" },
> + " [ msglvl %d | msglvl type on|off ... ]\n"
> + " [ early-orphan on|off ]\n" },
> { "-a", "--show-pause", MODE_GPAUSE, "Show pause options" },
> { "-A", "--pause", MODE_SPAUSE, "Set pause options",
> " [ autoneg on|off ]\n"
> @@ -411,6 +412,10 @@ static int msglvl_changed;
> static u32 msglvl_wanted = 0;
> static u32 msglvl_mask = 0;
>
> +static u32 generic_flags_changed;
> +static u32 generic_flags_wanted = 0;
> +static u32 generic_flags_mask = 0;
> +
> static enum {
> ONLINE=0,
> OFFLINE,
> @@ -608,6 +613,11 @@ static struct cmdline_info cmdline_msglvl[] = {
> NETIF_MSG_WOL, &msglvl_mask },
> };
>
> +static struct cmdline_info cmdline_generic_flags[] = {
> + { "early-orphan", CMDL_FLAG, &generic_flags_wanted, NULL,
> + ETH_FLAG_EARLY_ORPHAN, &generic_flags_mask },
> +};
> +
> static long long
> get_int_range(char *str, int base, long long min, long long max)
> {
> @@ -1125,7 +1135,13 @@ static void parse_cmdline(int argc, char **argp)
> }
> break;
> }
> - show_usage(1);
> + parse_generic_cmdline(
> + argc, argp, i,
> + &generic_flags_changed,
> + cmdline_generic_flags,
> + ARRAY_SIZE(cmdline_generic_flags));
> + i = argc;
> + break;
This seems to introduce an order-dependency which doesn't exist with any
of the other keyword arguments after -s.
[...]
> + if (generic_flags_changed) {
> + printf("generic flags changed\n");
> + struct ethtool_value edata;
> +
> + edata.cmd = ETHTOOL_GFLAGS;
> + edata.data = 0;
> + ifr->ifr_data = (caddr_t)&edata;
> + err = ioctl(fd, SIOCETHTOOL, ifr);
> + if (err) {
> + perror("Cannot get device flag settings");
> + return 91;
> + }
> +
> + edata.cmd = ETHTOOL_SFLAGS;
> + edata.data = ((edata.data & ~generic_flags_mask) |
> + generic_flags_wanted);
> +
> + err = ioctl(fd, SIOCETHTOOL, ifr);
> + if (err)
> + perror("Cannot set device flag settings");
> + }
> return 0;
> }
[...]
This has a silent failure case (silent to any script checking the exit
code, anyway).
Ben.
--
Ben Hutchings, Senior Software Engineer, Solarflare Communications
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists