|
 |
4aca6e |
From 39f9fe4a47b1bb564c72944b624889d48dda2c3d Mon Sep 17 00:00:00 2001
|
|
|
4aca6e |
From: Sabrina Dubroca <sdubroca@redhat.com>
|
|
|
4aca6e |
Date: Fri, 9 Jun 2017 10:08:00 +0200
|
|
|
4aca6e |
Subject: [PATCH] devlink: whitespace cleanup
|
|
|
4aca6e |
|
|
|
4aca6e |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1459772
|
|
|
4aca6e |
Upstream Status: iproute2.git commit 7c55d7700f43
|
|
|
4aca6e |
|
|
|
4aca6e |
commit 7c55d7700f4320186784590516993a73183bc2f2
|
|
|
4aca6e |
Author: Stephen Hemminger <stephen@networkplumber.org>
|
|
|
4aca6e |
Date: Mon Aug 29 11:17:38 2016 -0700
|
|
|
4aca6e |
|
|
|
4aca6e |
devlink: whitespace cleanup
|
|
|
4aca6e |
|
|
|
4aca6e |
Break long lines
|
|
|
4aca6e |
|
|
|
4aca6e |
Signed-off-by: Sabrina Dubroca <sdubroca@redhat.com>
|
|
|
4aca6e |
---
|
|
|
4aca6e |
devlink/devlink.c | 7 +++++--
|
|
|
4aca6e |
1 file changed, 5 insertions(+), 2 deletions(-)
|
|
|
4aca6e |
|
|
|
4aca6e |
diff --git a/devlink/devlink.c b/devlink/devlink.c
|
|
|
4aca6e |
index ab55f8c73681..52fc7f49f51c 100644
|
|
|
4aca6e |
--- a/devlink/devlink.c
|
|
|
4aca6e |
+++ b/devlink/devlink.c
|
|
|
4aca6e |
@@ -659,7 +659,8 @@ static int threshold_type_get(const char *typestr,
|
|
|
4aca6e |
return 0;
|
|
|
4aca6e |
}
|
|
|
4aca6e |
|
|
|
4aca6e |
-static int eswitch_mode_get(const char *typestr, enum devlink_eswitch_mode *p_mode)
|
|
|
4aca6e |
+static int eswitch_mode_get(const char *typestr,
|
|
|
4aca6e |
+ enum devlink_eswitch_mode *p_mode)
|
|
|
4aca6e |
{
|
|
|
4aca6e |
if (strcmp(typestr, ESWITCH_MODE_LEGACY) == 0) {
|
|
|
4aca6e |
*p_mode = DEVLINK_ESWITCH_MODE_LEGACY;
|
|
|
4aca6e |
@@ -784,6 +785,7 @@ static int dl_argv_parse(struct dl *dl, uint32_t o_required,
|
|
|
4aca6e |
} else if (dl_argv_match(dl, "mode") &&
|
|
|
4aca6e |
(o_all & DL_OPT_ESWITCH_MODE)) {
|
|
|
4aca6e |
const char *typestr;
|
|
|
4aca6e |
+
|
|
|
4aca6e |
dl_arg_inc(dl);
|
|
|
4aca6e |
err = dl_argv_str(dl, &typestr);
|
|
|
4aca6e |
if (err)
|
|
|
4aca6e |
@@ -846,7 +848,8 @@ static int dl_argv_parse(struct dl *dl, uint32_t o_required,
|
|
|
4aca6e |
return -EINVAL;
|
|
|
4aca6e |
}
|
|
|
4aca6e |
|
|
|
4aca6e |
- if ((o_required & DL_OPT_ESWITCH_MODE) && !(o_found & DL_OPT_ESWITCH_MODE)) {
|
|
|
4aca6e |
+ if ((o_required & DL_OPT_ESWITCH_MODE) &&
|
|
|
4aca6e |
+ !(o_found & DL_OPT_ESWITCH_MODE)) {
|
|
|
4aca6e |
pr_err("E-Switch mode option expected.\n");
|
|
|
4aca6e |
return -EINVAL;
|
|
|
4aca6e |
}
|
|
|
4aca6e |
--
|
|
|
4aca6e |
2.13.1
|
|
|
4aca6e |
|