| Message ID | 20210120122122.13641-1-ashiduka@fujitsu.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Michal Kubecek |
| Headers | show |
| Series | [ethtool] Fix help message for master-slave option | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
On Wed, Jan 20, 2021 at 09:21:22PM +0900, Yuusuke Ashizuka wrote: > Fixes: 558f7cc33daf ("netlink: add master/slave configuration support") > Signed-off-by: Yuusuke Ashizuka <ashiduka@fujitsu.com> Applied, thank you. Michal > --- > ethtool.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/ethtool.c b/ethtool.c > index 585aafa..84a61f4 100644 > --- a/ethtool.c > +++ b/ethtool.c > @@ -5630,7 +5630,7 @@ static const struct option args[] = { > " [ wol %d[/%d] | p|u|m|b|a|g|s|f|d... ]\n" > " [ sopass %x:%x:%x:%x:%x:%x ]\n" > " [ msglvl %d[/%d] | type on|off ... [--] ]\n" > - " [ master-slave master-preferred|slave-preferred|master-force|slave-force ]\n" > + " [ master-slave preferred-master|preferred-slave|forced-master|forced-slave ]\n" > }, > { > .opts = "-a|--show-pause", > -- > 2.29.2 >
diff --git a/ethtool.c b/ethtool.c index 585aafa..84a61f4 100644 --- a/ethtool.c +++ b/ethtool.c @@ -5630,7 +5630,7 @@ static const struct option args[] = { " [ wol %d[/%d] | p|u|m|b|a|g|s|f|d... ]\n" " [ sopass %x:%x:%x:%x:%x:%x ]\n" " [ msglvl %d[/%d] | type on|off ... [--] ]\n" - " [ master-slave master-preferred|slave-preferred|master-force|slave-force ]\n" + " [ master-slave preferred-master|preferred-slave|forced-master|forced-slave ]\n" }, { .opts = "-a|--show-pause",
Fixes: 558f7cc33daf ("netlink: add master/slave configuration support") Signed-off-by: Yuusuke Ashizuka <ashiduka@fujitsu.com> --- ethtool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)