|
|
149f89 |
From ec0ef0916c7d8d5f1b618610f202c805f1955827 Mon Sep 17 00:00:00 2001
|
|
|
149f89 |
From: Gal Pressman <galp@mellanox.com>
|
|
|
149f89 |
Date: Thu, 26 Oct 2017 17:44:43 +0300
|
|
|
149f89 |
Subject: [PATCH] ethtool: Fix coding style warnings and errors reported by
|
|
|
149f89 |
checkpatch
|
|
|
149f89 |
|
|
|
149f89 |
Checkpatch had a lot to say about ethtool.c, this will handle a lot of
|
|
|
149f89 |
the reported issues.
|
|
|
149f89 |
|
|
|
149f89 |
Signed-off-by: Gal Pressman <galp@mellanox.com>
|
|
|
149f89 |
Reviewed-by: Tariq Toukan <tariqt@mellanox.com>
|
|
|
149f89 |
(cherry picked from commit 5a20e546c0bf4b479f1b3cd272ea366a6069bfa4)
|
|
|
149f89 |
---
|
|
|
149f89 |
ethtool.c | 189 +++++++++++++++++++++++++++++---------------------------------
|
|
|
149f89 |
1 file changed, 89 insertions(+), 100 deletions(-)
|
|
|
149f89 |
|
|
|
149f89 |
diff --git a/ethtool.c b/ethtool.c
|
|
|
149f89 |
index 2ecc13f..06006f4 100644
|
|
|
149f89 |
--- a/ethtool.c
|
|
|
149f89 |
+++ b/ethtool.c
|
|
|
149f89 |
@@ -235,7 +235,7 @@ get_uint_range(char *str, int base, unsigned long long max)
|
|
|
149f89 |
exit_bad_args();
|
|
|
149f89 |
errno = 0;
|
|
|
149f89 |
v = strtoull(str, &endp, base);
|
|
|
149f89 |
- if ( errno || *endp || v > max)
|
|
|
149f89 |
+ if (errno || *endp || v > max)
|
|
|
149f89 |
exit_bad_args();
|
|
|
149f89 |
return v;
|
|
|
149f89 |
}
|
|
|
149f89 |
@@ -261,9 +261,8 @@ static void get_mac_addr(char *src, unsigned char *dest)
|
|
|
149f89 |
if (count != ETH_ALEN)
|
|
|
149f89 |
exit_bad_args();
|
|
|
149f89 |
|
|
|
149f89 |
- for (i = 0; i < count; i++) {
|
|
|
149f89 |
+ for (i = 0; i < count; i++)
|
|
|
149f89 |
dest[i] = buf[i];
|
|
|
149f89 |
- }
|
|
|
149f89 |
}
|
|
|
149f89 |
|
|
|
149f89 |
static int parse_hex_u32_bitmap(const char *s,
|
|
|
149f89 |
@@ -408,7 +407,7 @@ static void parse_generic_cmdline(struct cmd_context *ctx,
|
|
|
149f89 |
break;
|
|
|
149f89 |
}
|
|
|
149f89 |
}
|
|
|
149f89 |
- if( !found)
|
|
|
149f89 |
+ if (!found)
|
|
|
149f89 |
exit_bad_args();
|
|
|
149f89 |
}
|
|
|
149f89 |
}
|
|
|
149f89 |
@@ -686,10 +685,10 @@ static void dump_link_caps(const char *prefix, const char *an_prefix,
|
|
|
149f89 |
"10000baseLRM/Full" },
|
|
|
149f89 |
{ 0, ETHTOOL_LINK_MODE_10000baseER_Full_BIT,
|
|
|
149f89 |
"10000baseER/Full" },
|
|
|
149f89 |
- { 0, ETHTOOL_LINK_MODE_2500baseT_Full_BIT,
|
|
|
149f89 |
- "2500baseT/Full" },
|
|
|
149f89 |
- { 0, ETHTOOL_LINK_MODE_5000baseT_Full_BIT,
|
|
|
149f89 |
- "5000baseT/Full" },
|
|
|
149f89 |
+ { 0, ETHTOOL_LINK_MODE_2500baseT_Full_BIT,
|
|
|
149f89 |
+ "2500baseT/Full" },
|
|
|
149f89 |
+ { 0, ETHTOOL_LINK_MODE_5000baseT_Full_BIT,
|
|
|
149f89 |
+ "5000baseT/Full" },
|
|
|
149f89 |
};
|
|
|
149f89 |
int indent;
|
|
|
149f89 |
int did1, new_line_pend, i;
|
|
|
149f89 |
@@ -719,7 +718,7 @@ static void dump_link_caps(const char *prefix, const char *an_prefix,
|
|
|
149f89 |
}
|
|
|
149f89 |
}
|
|
|
149f89 |
if (did1 == 0)
|
|
|
149f89 |
- fprintf(stdout, "Not reported");
|
|
|
149f89 |
+ fprintf(stdout, "Not reported");
|
|
|
149f89 |
fprintf(stdout, "\n");
|
|
|
149f89 |
|
|
|
149f89 |
if (!link_mode_only) {
|
|
|
149f89 |
@@ -911,32 +910,32 @@ static int parse_wolopts(char *optstr, u32 *data)
|
|
|
149f89 |
*data = 0;
|
|
|
149f89 |
while (*optstr) {
|
|
|
149f89 |
switch (*optstr) {
|
|
|
149f89 |
- case 'p':
|
|
|
149f89 |
- *data |= WAKE_PHY;
|
|
|
149f89 |
- break;
|
|
|
149f89 |
- case 'u':
|
|
|
149f89 |
- *data |= WAKE_UCAST;
|
|
|
149f89 |
- break;
|
|
|
149f89 |
- case 'm':
|
|
|
149f89 |
- *data |= WAKE_MCAST;
|
|
|
149f89 |
- break;
|
|
|
149f89 |
- case 'b':
|
|
|
149f89 |
- *data |= WAKE_BCAST;
|
|
|
149f89 |
- break;
|
|
|
149f89 |
- case 'a':
|
|
|
149f89 |
- *data |= WAKE_ARP;
|
|
|
149f89 |
- break;
|
|
|
149f89 |
- case 'g':
|
|
|
149f89 |
- *data |= WAKE_MAGIC;
|
|
|
149f89 |
- break;
|
|
|
149f89 |
- case 's':
|
|
|
149f89 |
- *data |= WAKE_MAGICSECURE;
|
|
|
149f89 |
- break;
|
|
|
149f89 |
- case 'd':
|
|
|
149f89 |
- *data = 0;
|
|
|
149f89 |
- break;
|
|
|
149f89 |
- default:
|
|
|
149f89 |
- return -1;
|
|
|
149f89 |
+ case 'p':
|
|
|
149f89 |
+ *data |= WAKE_PHY;
|
|
|
149f89 |
+ break;
|
|
|
149f89 |
+ case 'u':
|
|
|
149f89 |
+ *data |= WAKE_UCAST;
|
|
|
149f89 |
+ break;
|
|
|
149f89 |
+ case 'm':
|
|
|
149f89 |
+ *data |= WAKE_MCAST;
|
|
|
149f89 |
+ break;
|
|
|
149f89 |
+ case 'b':
|
|
|
149f89 |
+ *data |= WAKE_BCAST;
|
|
|
149f89 |
+ break;
|
|
|
149f89 |
+ case 'a':
|
|
|
149f89 |
+ *data |= WAKE_ARP;
|
|
|
149f89 |
+ break;
|
|
|
149f89 |
+ case 'g':
|
|
|
149f89 |
+ *data |= WAKE_MAGIC;
|
|
|
149f89 |
+ break;
|
|
|
149f89 |
+ case 's':
|
|
|
149f89 |
+ *data |= WAKE_MAGICSECURE;
|
|
|
149f89 |
+ break;
|
|
|
149f89 |
+ case 'd':
|
|
|
149f89 |
+ *data = 0;
|
|
|
149f89 |
+ break;
|
|
|
149f89 |
+ default:
|
|
|
149f89 |
+ return -1;
|
|
|
149f89 |
}
|
|
|
149f89 |
optstr++;
|
|
|
149f89 |
}
|
|
|
149f89 |
@@ -981,10 +980,11 @@ static int dump_wol(struct ethtool_wolinfo *wol)
|
|
|
149f89 |
if (wol->supported & WAKE_MAGICSECURE) {
|
|
|
149f89 |
int i;
|
|
|
149f89 |
int delim = 0;
|
|
|
149f89 |
+
|
|
|
149f89 |
fprintf(stdout, " SecureOn password: ");
|
|
|
149f89 |
for (i = 0; i < SOPASS_MAX; i++) {
|
|
|
149f89 |
fprintf(stdout, "%s%02x", delim?":":"", wol->sopass[i]);
|
|
|
149f89 |
- delim=1;
|
|
|
149f89 |
+ delim = 1;
|
|
|
149f89 |
}
|
|
|
149f89 |
fprintf(stdout, "\n");
|
|
|
149f89 |
}
|
|
|
149f89 |
@@ -997,32 +997,32 @@ static int parse_rxfhashopts(char *optstr, u32 *data)
|
|
|
149f89 |
*data = 0;
|
|
|
149f89 |
while (*optstr) {
|
|
|
149f89 |
switch (*optstr) {
|
|
|
149f89 |
- case 'm':
|
|
|
149f89 |
- *data |= RXH_L2DA;
|
|
|
149f89 |
- break;
|
|
|
149f89 |
- case 'v':
|
|
|
149f89 |
- *data |= RXH_VLAN;
|
|
|
149f89 |
- break;
|
|
|
149f89 |
- case 't':
|
|
|
149f89 |
- *data |= RXH_L3_PROTO;
|
|
|
149f89 |
- break;
|
|
|
149f89 |
- case 's':
|
|
|
149f89 |
- *data |= RXH_IP_SRC;
|
|
|
149f89 |
- break;
|
|
|
149f89 |
- case 'd':
|
|
|
149f89 |
- *data |= RXH_IP_DST;
|
|
|
149f89 |
- break;
|
|
|
149f89 |
- case 'f':
|
|
|
149f89 |
- *data |= RXH_L4_B_0_1;
|
|
|
149f89 |
- break;
|
|
|
149f89 |
- case 'n':
|
|
|
149f89 |
- *data |= RXH_L4_B_2_3;
|
|
|
149f89 |
- break;
|
|
|
149f89 |
- case 'r':
|
|
|
149f89 |
- *data |= RXH_DISCARD;
|
|
|
149f89 |
- break;
|
|
|
149f89 |
- default:
|
|
|
149f89 |
- return -1;
|
|
|
149f89 |
+ case 'm':
|
|
|
149f89 |
+ *data |= RXH_L2DA;
|
|
|
149f89 |
+ break;
|
|
|
149f89 |
+ case 'v':
|
|
|
149f89 |
+ *data |= RXH_VLAN;
|
|
|
149f89 |
+ break;
|
|
|
149f89 |
+ case 't':
|
|
|
149f89 |
+ *data |= RXH_L3_PROTO;
|
|
|
149f89 |
+ break;
|
|
|
149f89 |
+ case 's':
|
|
|
149f89 |
+ *data |= RXH_IP_SRC;
|
|
|
149f89 |
+ break;
|
|
|
149f89 |
+ case 'd':
|
|
|
149f89 |
+ *data |= RXH_IP_DST;
|
|
|
149f89 |
+ break;
|
|
|
149f89 |
+ case 'f':
|
|
|
149f89 |
+ *data |= RXH_L4_B_0_1;
|
|
|
149f89 |
+ break;
|
|
|
149f89 |
+ case 'n':
|
|
|
149f89 |
+ *data |= RXH_L4_B_2_3;
|
|
|
149f89 |
+ break;
|
|
|
149f89 |
+ case 'r':
|
|
|
149f89 |
+ *data |= RXH_DISCARD;
|
|
|
149f89 |
+ break;
|
|
|
149f89 |
+ default:
|
|
|
149f89 |
+ return -1;
|
|
|
149f89 |
}
|
|
|
149f89 |
optstr++;
|
|
|
149f89 |
}
|
|
|
149f89 |
@@ -1036,27 +1036,20 @@ static char *unparse_rxfhashopts(u64 opts)
|
|
|
149f89 |
memset(buf, 0, sizeof(buf));
|
|
|
149f89 |
|
|
|
149f89 |
if (opts) {
|
|
|
149f89 |
- if (opts & RXH_L2DA) {
|
|
|
149f89 |
+ if (opts & RXH_L2DA)
|
|
|
149f89 |
strcat(buf, "L2DA\n");
|
|
|
149f89 |
- }
|
|
|
149f89 |
- if (opts & RXH_VLAN) {
|
|
|
149f89 |
+ if (opts & RXH_VLAN)
|
|
|
149f89 |
strcat(buf, "VLAN tag\n");
|
|
|
149f89 |
- }
|
|
|
149f89 |
- if (opts & RXH_L3_PROTO) {
|
|
|
149f89 |
+ if (opts & RXH_L3_PROTO)
|
|
|
149f89 |
strcat(buf, "L3 proto\n");
|
|
|
149f89 |
- }
|
|
|
149f89 |
- if (opts & RXH_IP_SRC) {
|
|
|
149f89 |
+ if (opts & RXH_IP_SRC)
|
|
|
149f89 |
strcat(buf, "IP SA\n");
|
|
|
149f89 |
- }
|
|
|
149f89 |
- if (opts & RXH_IP_DST) {
|
|
|
149f89 |
+ if (opts & RXH_IP_DST)
|
|
|
149f89 |
strcat(buf, "IP DA\n");
|
|
|
149f89 |
- }
|
|
|
149f89 |
- if (opts & RXH_L4_B_0_1) {
|
|
|
149f89 |
+ if (opts & RXH_L4_B_0_1)
|
|
|
149f89 |
strcat(buf, "L4 bytes 0 & 1 [TCP/UDP src port]\n");
|
|
|
149f89 |
- }
|
|
|
149f89 |
- if (opts & RXH_L4_B_2_3) {
|
|
|
149f89 |
+ if (opts & RXH_L4_B_2_3)
|
|
|
149f89 |
strcat(buf, "L4 bytes 2 & 3 [TCP/UDP dst port]\n");
|
|
|
149f89 |
- }
|
|
|
149f89 |
} else {
|
|
|
149f89 |
sprintf(buf, "None");
|
|
|
149f89 |
}
|
|
|
149f89 |
@@ -1157,10 +1150,10 @@ static const struct {
|
|
|
149f89 |
{ "tg3", tg3_dump_regs },
|
|
|
149f89 |
{ "skge", skge_dump_regs },
|
|
|
149f89 |
{ "sky2", sky2_dump_regs },
|
|
|
149f89 |
- { "vioc", vioc_dump_regs },
|
|
|
149f89 |
- { "smsc911x", smsc911x_dump_regs },
|
|
|
149f89 |
- { "at76c50x-usb", at76c50x_usb_dump_regs },
|
|
|
149f89 |
- { "sfc", sfc_dump_regs },
|
|
|
149f89 |
+ { "vioc", vioc_dump_regs },
|
|
|
149f89 |
+ { "smsc911x", smsc911x_dump_regs },
|
|
|
149f89 |
+ { "at76c50x-usb", at76c50x_usb_dump_regs },
|
|
|
149f89 |
+ { "sfc", sfc_dump_regs },
|
|
|
149f89 |
{ "st_mac100", st_mac100_dump_regs },
|
|
|
149f89 |
{ "st_gmac", st_gmac_dump_regs },
|
|
|
149f89 |
{ "et131x", et131x_dump_regs },
|
|
|
149f89 |
@@ -2805,7 +2798,7 @@ static int do_sset(struct cmd_context *ctx)
|
|
|
149f89 |
i += 1;
|
|
|
149f89 |
if (i >= argc)
|
|
|
149f89 |
exit_bad_args();
|
|
|
149f89 |
- speed_wanted = get_int(argp[i],10);
|
|
|
149f89 |
+ speed_wanted = get_int(argp[i], 10);
|
|
|
149f89 |
} else if (!strcmp(argp[i], "duplex")) {
|
|
|
149f89 |
gset_changed = 1;
|
|
|
149f89 |
i += 1;
|
|
|
149f89 |
@@ -3016,7 +3009,7 @@ static int do_sset(struct cmd_context *ctx)
|
|
|
149f89 |
speed_wanted);
|
|
|
149f89 |
if (duplex_wanted >= 0)
|
|
|
149f89 |
fprintf(stderr, " duplex %s",
|
|
|
149f89 |
- duplex_wanted ?
|
|
|
149f89 |
+ duplex_wanted ?
|
|
|
149f89 |
"full" : "half");
|
|
|
149f89 |
fprintf(stderr, "\n");
|
|
|
149f89 |
}
|
|
|
149f89 |
@@ -3101,14 +3094,12 @@ static int do_sset(struct cmd_context *ctx)
|
|
|
149f89 |
perror("Cannot get current wake-on-lan settings");
|
|
|
149f89 |
} else {
|
|
|
149f89 |
/* Change everything the user specified. */
|
|
|
149f89 |
- if (wol_change) {
|
|
|
149f89 |
+ if (wol_change)
|
|
|
149f89 |
wol.wolopts = wol_wanted;
|
|
|
149f89 |
- }
|
|
|
149f89 |
if (sopass_change) {
|
|
|
149f89 |
int i;
|
|
|
149f89 |
- for (i = 0; i < SOPASS_MAX; i++) {
|
|
|
149f89 |
+ for (i = 0; i < SOPASS_MAX; i++)
|
|
|
149f89 |
wol.sopass[i] = sopass_wanted[i];
|
|
|
149f89 |
- }
|
|
|
149f89 |
}
|
|
|
149f89 |
|
|
|
149f89 |
/* Try to perform the update. */
|
|
|
149f89 |
@@ -3205,7 +3196,7 @@ static int do_gregs(struct cmd_context *ctx)
|
|
|
149f89 |
free(regs);
|
|
|
149f89 |
return 75;
|
|
|
149f89 |
}
|
|
|
149f89 |
- }
|
|
|
149f89 |
+ }
|
|
|
149f89 |
|
|
|
149f89 |
if (dump_regs(gregs_dump_raw, gregs_dump_hex,
|
|
|
149f89 |
&drvinfo, regs) < 0) {
|
|
|
149f89 |
@@ -3364,7 +3355,7 @@ static int do_seeprom(struct cmd_context *ctx)
|
|
|
149f89 |
static int do_test(struct cmd_context *ctx)
|
|
|
149f89 |
{
|
|
|
149f89 |
enum {
|
|
|
149f89 |
- ONLINE=0,
|
|
|
149f89 |
+ ONLINE = 0,
|
|
|
149f89 |
OFFLINE,
|
|
|
149f89 |
EXTERNAL_LB,
|
|
|
149f89 |
} test_type;
|
|
|
149f89 |
@@ -3375,15 +3366,14 @@ static int do_test(struct cmd_context *ctx)
|
|
|
149f89 |
if (ctx->argc > 1)
|
|
|
149f89 |
exit_bad_args();
|
|
|
149f89 |
if (ctx->argc == 1) {
|
|
|
149f89 |
- if (!strcmp(ctx->argp[0], "online")) {
|
|
|
149f89 |
+ if (!strcmp(ctx->argp[0], "online"))
|
|
|
149f89 |
test_type = ONLINE;
|
|
|
149f89 |
- } else if (!strcmp(*ctx->argp, "offline")) {
|
|
|
149f89 |
+ else if (!strcmp(*ctx->argp, "offline"))
|
|
|
149f89 |
test_type = OFFLINE;
|
|
|
149f89 |
- } else if (!strcmp(*ctx->argp, "external_lb")) {
|
|
|
149f89 |
+ else if (!strcmp(*ctx->argp, "external_lb"))
|
|
|
149f89 |
test_type = EXTERNAL_LB;
|
|
|
149f89 |
- } else {
|
|
|
149f89 |
+ else
|
|
|
149f89 |
exit_bad_args();
|
|
|
149f89 |
- }
|
|
|
149f89 |
} else {
|
|
|
149f89 |
test_type = OFFLINE;
|
|
|
149f89 |
}
|
|
|
149f89 |
@@ -3414,7 +3404,7 @@ static int do_test(struct cmd_context *ctx)
|
|
|
149f89 |
err = send_ioctl(ctx, test);
|
|
|
149f89 |
if (err < 0) {
|
|
|
149f89 |
perror("Cannot test");
|
|
|
149f89 |
- free (test);
|
|
|
149f89 |
+ free(test);
|
|
|
149f89 |
free(strings);
|
|
|
149f89 |
return 74;
|
|
|
149f89 |
}
|
|
|
149f89 |
@@ -3556,7 +3546,7 @@ static int do_srxclass(struct cmd_context *ctx)
|
|
|
149f89 |
err = send_ioctl(ctx, &nfccmd);
|
|
|
149f89 |
if (err < 0)
|
|
|
149f89 |
perror("Cannot change RX network flow hashing options");
|
|
|
149f89 |
- } else if (!strcmp(ctx->argp[0], "flow-type")) {
|
|
|
149f89 |
+ } else if (!strcmp(ctx->argp[0], "flow-type")) {
|
|
|
149f89 |
struct ethtool_rx_flow_spec rx_rule_fs;
|
|
|
149f89 |
__u32 rss_context = 0;
|
|
|
149f89 |
|
|
|
149f89 |
@@ -4325,8 +4315,8 @@ static int do_srxntuple(struct cmd_context *ctx,
|
|
|
149f89 |
/*
|
|
|
149f89 |
* Display error only if response is something other than op not
|
|
|
149f89 |
* supported. It is possible that the interface uses the network
|
|
|
149f89 |
- * flow classifier interface instead of N-tuple.
|
|
|
149f89 |
- */
|
|
|
149f89 |
+ * flow classifier interface instead of N-tuple.
|
|
|
149f89 |
+ */
|
|
|
149f89 |
if (err < 0) {
|
|
|
149f89 |
if (errno != EOPNOTSUPP)
|
|
|
149f89 |
perror("Cannot add new rule via N-tuple");
|
|
|
149f89 |
@@ -4468,7 +4458,7 @@ static int do_gprivflags(struct cmd_context *ctx)
|
|
|
149f89 |
|
|
|
149f89 |
/* Find longest string and align all strings accordingly */
|
|
|
149f89 |
for (i = 0; i < strings->len; i++) {
|
|
|
149f89 |
- cur_len = strlen((const char*)strings->data +
|
|
|
149f89 |
+ cur_len = strlen((const char *)strings->data +
|
|
|
149f89 |
i * ETH_GSTRING_LEN);
|
|
|
149f89 |
if (cur_len > max_len)
|
|
|
149f89 |
max_len = cur_len;
|
|
|
149f89 |
@@ -4718,7 +4708,6 @@ static int do_seee(struct cmd_context *ctx)
|
|
|
149f89 |
do_generic_set(cmdline_eee, ARRAY_SIZE(cmdline_eee), &change2);
|
|
|
149f89 |
|
|
|
149f89 |
if (change2) {
|
|
|
149f89 |
-
|
|
|
149f89 |
eeecmd.cmd = ETHTOOL_SEEE;
|
|
|
149f89 |
if (send_ioctl(ctx, &eeecmd)) {
|
|
|
149f89 |
perror("Cannot set EEE settings");
|
|
|
149f89 |
@@ -4958,7 +4947,7 @@ static const struct option {
|
|
|
149f89 |
" [ tx N ]\n"
|
|
|
149f89 |
" [ other N ]\n"
|
|
|
149f89 |
" [ combined N ]\n" },
|
|
|
149f89 |
- { "--show-priv-flags" , 1, do_gprivflags, "Query private flags" },
|
|
|
149f89 |
+ { "--show-priv-flags", 1, do_gprivflags, "Query private flags" },
|
|
|
149f89 |
{ "--set-priv-flags", 1, do_sprivflags, "Set private flags",
|
|
|
149f89 |
" FLAG on|off ...\n" },
|
|
|
149f89 |
{ "-m|--dump-module-eeprom|--module-info", 1, do_getmodule,
|
|
|
149f89 |
--
|
|
|
149f89 |
1.8.3.1
|
|
|
149f89 |
|