devlink: spring cleanup
Subsystems (2)
cover devlink: spring cleanup
From: Jiri Pirko <[email protected]>
This patchset contains couple of small fixes, consistency changes, help and man adjustments.
Jiri Pirko (8):
devlink: remove custom bool command line options parsing
devlink: Fix help and man of "devlink health set" command
devlink: fix encap mode manupulation
devlink: Add alias "counters_enabled" for "counters" option
devlink: rename dpipe_counters_enable struct field to
dpipe_counters_enabled
devlink: Fix help message for dpipe
devlink: remove "dev" object sub help messages
man: add man page for devlink dpipe
bash-completion/devlink | 8 +-- devlink/devlink.c | 131 +++++++++++++++++--------------------- man/man8/devlink-dev.8 | 8 +-- man/man8/devlink-dpipe.8 | 100 +++++++++++++++++++++++++++++ man/man8/devlink-health.8 | 30 +++++---- 5 files changed, 181 insertions(+), 96 deletions(-) create mode 100644 man/man8/devlink-dpipe.8
Signature · 1 line
2.21.1
PATCH 1/8 devlink: remove custom bool command line options parsing
From: Jiri Pirko <[email protected]>
Change the code that is doing custom processing of boolean command line options to use dl_argv_bool(). Extend strtobool() to accept "enable"/"disable" to maintain current behavior.
--- devlink/devlink.c | 28 +++++----------------------- 1 file changed, 5 insertions(+), 23 deletions(-)
devlink/devlink.c +5 -23
@@ -752,9 +752,11 @@ static int strtobool(const char *str, bool *p_val) {bool val; -if (!strcmp (str,"true" ) || !strcmp (str,"1" )) +if (!strcmp (str,"true" ) || !strcmp (str,"1" ) || + !strcmp (str,"enable" )) val = true; -else if (!strcmp (str,"false" ) || !strcmp (str,"0" )) +else if (!strcmp (str,"false" ) || !strcmp (str,"0" ) || + !strcmp (str,"disable" )) val = false;else return -EINVAL ;
@@ -1089,20 +1091,6 @@ static int eswitch_inline_mode_get(const char *typestr,return 0 ; } -static int dpipe_counters_enable_get (const char *typestr, -bool *counters_enable) -{ -if (strcmp (typestr,"enable" ) ==0 ) { - *counters_enable =1 ; - }else if (strcmp (typestr,"disable" ) ==0 ) { - *counters_enable =0 ; - }else { -pr_err ("Unknown counter_state \"%s\"\n" , typestr); -return -EINVAL ; - } -return 0 ; -} -static int eswitch_encap_mode_get (const char *typestr,bool *p_mode) {if (strcmp (typestr,"enable" ) ==0 ) {
@@ -1349,14 +1337,8 @@ static int dl_argv_parse(struct dl *dl, uint64_t o_required, o_found |=DL_OPT_DPIPE_TABLE_NAME ; }else if (dl_argv_match (dl,"counters" ) && (o_all &DL_OPT_DPIPE_TABLE_COUNTERS )) { -const char *typestr; -dl_arg_inc (dl); - err =dl_argv_str (dl, &typestr); -if (err) -return err; - err =dpipe_counters_enable_get (typestr, - &opts->dpipe_counters_enable); + err =dl_argv_bool (dl, &opts->dpipe_counters_enable);if (err)return err; o_found |=DL_OPT_DPIPE_TABLE_COUNTERS ;
Signature · 1 line
2.21.1
PATCH 2/8 devlink: Fix help and man of "devlink health set" command
In reply to Jiri PirkoFrom: Jiri Pirko <[email protected]>
Fix the help and man page of "devlink health set" command to be aligned with the rest of helps and man pages.
--- devlink/devlink.c | 4 +++- man/man8/devlink-health.8 | 30 ++++++++++++++++-------------- 2 files changed, 19 insertions(+), 15 deletions(-)
devlink/devlink.c +3 -1
@@ -6901,7 +6901,9 @@ static void cmd_health_help(void)pr_err (" devlink health diagnose DEV reporter REPORTER_NAME\n" );pr_err (" devlink health dump show DEV reporter REPORTER_NAME\n" );pr_err (" devlink health dump clear DEV reporter REPORTER_NAME\n" ); -pr_err (" devlink health set DEV reporter REPORTER_NAME { grace_period | auto_recover } { msec | boolean }\n" ); +pr_err (" devlink health set DEV reporter REPORTER_NAME\n" ); +pr_err (" [ grace_period MSEC ]\n" ); +pr_err (" [ auto_recover { true | false } ]\n" ); }static int cmd_health (struct dl *dl)
man/man8/devlink-health.8 +16 -14
@@ -52,13 +52,13 @@ devlink-health \- devlink health reporting and recovery .RI "" DEV "" .B reporter .RI "" REPORTER "" -.RI " { " -.B grace_period | auto_recover -.RI " } { " -.RI "" msec "" -.RI "|" -.RI "" boolean "" -.RI " } " +.RI "[ " +.BI "grace_period " MSEC " +.RI "]" +.RI "[ " +.BR auto_recover " { " true " | " false " } " +.RI "]" + .ti -8 .B devlink health help
@@ -130,15 +130,9 @@ the next "devlink health dump show" command. .I "REPORTER" - specifies the reporter's name registered on the devlink device. -.SS devlink health set - Enable the user to configure: -.PD 0 -1) grace_period [msec] - Time interval between consecutive auto recoveries. -.P -2) auto_recover [true/false] - Indicates whether the devlink should execute automatic recover on error. -.P +.SS devlink health set - Configure health reporter. Please note that this command is not supported on a reporter which doesn't support a recovery method. -.PD .PP .I "DEV"
@@ -148,6 +142,14 @@ doesn't support a recovery method. .I "REPORTER" - specifies the reporter's name registered on the devlink device. +.TP +.BI grace_period " MSEC " +Time interval between consecutive auto recoveries. + +.TP +.BR auto_recover " { " true " | " false " } " +Indicates whether the devlink should execute automatic recover on error. + .SH "EXAMPLES" .PP devlink health show
Signature · 1 line
2.21.1
PATCH 3/8 devlink: fix encap mode manupulation
In reply to Jiri PirkoFrom: Jiri Pirko <[email protected]>
DEVLINK_ATTR_ESWITCH_ENCAP_MODE netlink attribute carries enum. But the code assumes bool value. Fix this by treating the encap mode in the same way as other eswitch mode attributes, switching from "enable"/"disable" to "basic"/"none", according to the enum. Maintain the backward compatibility to allow user to pass "enable"/"disable" too. Also to be in-sync with the rest of the "mode" commands, rename to "encap-mode". Adjust the help and man page accordingly.
--- bash-completion/devlink | 8 +++---- devlink/devlink.c | 46 ++++++++++++++++++++++++++++++----------- man/man8/devlink-dev.8 | 8 +++---- 3 files changed, 42 insertions(+), 20 deletions(-)
bash-completion/devlink +4 -4
@@ -100,11 +100,11 @@ _devlink_dev_eswitch_set() local -A settings=( [mode]=notseen [inline-mode]=notseen - [encap]=notseen + [encap-mode]=notseen ) if [[ $cword -eq 5 ]]; then - COMPREPLY=( $( compgen -W "mode inline-mode encap" -- "$cur" ) ) + COMPREPLY=( $( compgen -W "mode inline-mode encap-mode" -- "$cur" ) ) fi # Mark seen settings
@@ -127,8 +127,8 @@ _devlink_dev_eswitch_set() "$cur" ) ) return ;; - encap) - COMPREPLY=( $( compgen -W "disable enable" -- "$cur" ) ) + encap-mode) + COMPREPLY=( $( compgen -W "none basic" -- "$cur" ) ) return ;; esac
devlink/devlink.c +34 -12
90 lines not on this page · raw message
man/man8/devlink-dev.8 +4 -4
@@ -35,7 +35,7 @@ devlink-dev \- devlink device configuration .BR inline-mode " { " none " | " link " | " network " | " transport " } " .RI "]" .RI "[ " -.BR encap " { " disable " | " enable " } " +.BR encap-mode " { " none " | " basic " } " .RI "]" .ti -8
@@ -125,13 +125,13 @@ Some HWs need the VF driver to put part of the packet headers on the TX descript - L4 mode .TP -.BR encap " { " disable " | " enable " } " +.BR encap-mode " { " none " | " basic " } " Set eswitch encapsulation support -.I disable +.I none - Disable encapsulation support -.I enable +.I basic - Enable encapsulation support .SS devlink dev param set - set new value to devlink device configuration parameter
Signature · 1 line
2.21.1
PATCH 4/8 devlink: Add alias "counters_enabled" for "counters" option
In reply to Jiri PirkoFrom: Jiri Pirko <[email protected]>
To be consistent with netlink attribute name and also with the "dpipe table show" output, add "counters_enabled" for "counters" in "dpipe table set" command.
--- devlink/devlink.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
devlink/devlink.c +2 -1
@@ -1345,7 +1345,8 @@ static int dl_argv_parse(struct dl *dl, uint64_t o_required,if (err)return err; o_found |=DL_OPT_DPIPE_TABLE_NAME ; - }else if (dl_argv_match (dl,"counters" ) && + }else if ((dl_argv_match (dl,"counters" ) || +dl_argv_match (dl,"counters_enabled" )) && (o_all &DL_OPT_DPIPE_TABLE_COUNTERS )) {dl_arg_inc (dl); err =dl_argv_bool (dl, &opts->dpipe_counters_enable);
Signature · 1 line
2.21.1
PATCH 5/8 devlink: rename dpipe_counters_enable struct field to dpipe_counters_enabled
In reply to Jiri PirkoFrom: Jiri Pirko <[email protected]>
To be consistent with the rest of the code and name of netlink attribute, rename the dpipe_counters_enable struct fielt to dpipe_counters_enabled.
--- devlink/devlink.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
devlink/devlink.c +3 -3
@@ -307,7 +307,7 @@ struct dl_opts {enum devlink_eswitch_mode eswitch_mode;enum devlink_eswitch_inline_mode eswitch_inline_mode;const char *dpipe_table_name; -bool dpipe_counters_enable; +bool dpipe_counters_enabled;enum devlink_eswitch_encap_mode eswitch_encap_mode;const char *resource_path;uint64_t resource_size;
@@ -1349,7 +1349,7 @@ static int dl_argv_parse(struct dl *dl, uint64_t o_required, dl_argv_match(dl, "counters_enabled")) && (o_all & DL_OPT_DPIPE_TABLE_COUNTERS)) {dl_arg_inc (dl); - err =dl_argv_bool (dl, &opts->dpipe_counters_enable); + err =dl_argv_bool (dl, &opts->dpipe_counters_enabled);if (err)return err; o_found |=DL_OPT_DPIPE_TABLE_COUNTERS ;
@@ -1579,7 +1579,7 @@ static void dl_opts_put(struct nlmsghdr *nlh, struct dl *dl) opts->dpipe_table_name);if (opts->present &DL_OPT_DPIPE_TABLE_COUNTERS )mnl_attr_put_u8 (nlh,DEVLINK_ATTR_DPIPE_TABLE_COUNTERS_ENABLED , - opts->dpipe_counters_enable); + opts->dpipe_counters_enabled);if (opts->present &DL_OPT_ESWITCH_ENCAP_MODE )mnl_attr_put_u8 (nlh,DEVLINK_ATTR_ESWITCH_ENCAP_MODE , opts->eswitch_encap_mode);
Signature · 1 line
2.21.1
PATCH 6/8 devlink: Fix help message for dpipe
In reply to Jiri PirkoFrom: Jiri Pirko <[email protected]>
Have one help message for all dpipe commands, as it is done for the rest of the devlink object. Possible and required options to the help.
--- devlink/devlink.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-)
devlink/devlink.c +8 -16
@@ -4953,15 +4953,19 @@ static int cmd_dpipe_headers_show(struct dl *dl)return err; } -static void cmd_dpipe_header_help (void ) +static void cmd_dpipe_help (void ) { -pr_err ("Usage: devlink dpipe headers show DEV\n" ); +pr_err ("Usage: devlink dpipe table show DEV [ name TABLE_NAME ]\n" ); +pr_err (" devlink dpipe table set DEV name TABLE_NAME\n" ); +pr_err (" [ counters_enabled { true | false } ]\n" ); +pr_err (" devlink dpipe table dump DEV name TABLE_NAME\n" ); +pr_err (" devlink dpipe header show DEV\n" ); }static int cmd_dpipe_header (struct dl *dl) {if (dl_argv_match (dl,"help" ) ||dl_no_arg (dl)) { -cmd_dpipe_header_help (); +cmd_dpipe_help ();return 0 ; }else if (dl_argv_match (dl,"show" )) {dl_arg_inc (dl);
@@ -5777,16 +5781,10 @@ out:return err; } -static void cmd_dpipe_table_help (void ) -{ -pr_err ("Usage: devlink dpipe table [ OBJECT-LIST ]\n" -"where OBJECT-LIST := { show | set | dump }\n" ); -} -static int cmd_dpipe_table (struct dl *dl) {if (dl_argv_match (dl,"help" ) ||dl_no_arg (dl)) { -cmd_dpipe_table_help (); +cmd_dpipe_help ();return 0 ; }else if (dl_argv_match (dl,"show" )) {dl_arg_inc (dl);
@@ -5802,12 +5800,6 @@ static int cmd_dpipe_table(struct dl *dl)return -ENOENT ; } -static void cmd_dpipe_help (void ) -{ -pr_err ("Usage: devlink dpipe [ OBJECT-LIST ]\n" -"where OBJECT-LIST := { header | table }\n" ); -} -static int cmd_dpipe (struct dl *dl) {if (dl_argv_match (dl,"help" ) ||dl_no_arg (dl)) {
Signature · 1 line
2.21.1
PATCH 7/8 devlink: remove "dev" object sub help messages
In reply to Jiri PirkoFrom: Jiri Pirko <[email protected]>
Remove duplicate sub help messages for "dev" object and have them all show help message for "dev".
--- devlink/devlink.c | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-)
devlink/devlink.c +3 -19
@@ -2740,18 +2740,13 @@ static int cmd_dev_show(struct dl *dl)return err; } -static void cmd_dev_reload_help (void ) -{ -pr_err ("Usage: devlink dev reload DEV [ netns { PID | NAME | ID } ]\n" ); -} -static int cmd_dev_reload (struct dl *dl) {struct nlmsghdr *nlh;int err;if (dl_argv_match (dl,"help" ) ||dl_no_arg (dl)) { -cmd_dev_reload_help (); +cmd_dev_help ();return 0 ; }
@@ -2873,11 +2868,6 @@ static int cmd_versions_show_cb(const struct nlmsghdr *nlh, void *data)return MNL_CB_OK ; } -static void cmd_dev_info_help (void ) -{ -pr_err ("Usage: devlink dev info [ DEV ]\n" ); -} -static int cmd_dev_info (struct dl *dl) {struct nlmsghdr *nlh;
@@ -2885,7 +2875,7 @@ static int cmd_dev_info(struct dl *dl)int err;if (dl_argv_match (dl,"help" )) { -cmd_dev_info_help (); +cmd_dev_help ();return 0 ; }
@@ -2906,12 +2896,6 @@ static int cmd_dev_info(struct dl *dl)return err; } -static void cmd_dev_flash_help (void ) -{ -pr_err ("Usage: devlink dev flash DEV file PATH [ component NAME ]\n" ); -} - -struct cmd_dev_flash_status_ctx {struct dl *dl;char *last_msg;
@@ -3059,7 +3043,7 @@ static int cmd_dev_flash(struct dl *dl)int err;if (dl_argv_match (dl,"help" ) ||dl_no_arg (dl)) { -cmd_dev_flash_help (); +cmd_dev_help ();return 0 ; }
Signature · 1 line
2.21.1
PATCH 8/8 man: add man page for devlink dpipe
In reply to Jiri PirkoFrom: Jiri Pirko <[email protected]>
Add simple man page for devlink dpipe.
--- man/man8/devlink-dpipe.8 | 100 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) create mode 100644 man/man8/devlink-dpipe.8
man/man8/devlink-dpipe.8 new file +100 -0
@@ -0,0 +1,100 @@ +.TH DEVLINK\-DPIPE 8 "4 Apr 2020" "iproute2" "Linux" +.SH NAME +devlink-dpipe \- devlink dataplane pipeline visualization +.SH SYNOPSIS +.sp +.ad l +.in +8 +.ti -8 +.B devlink +.RI "[ " OPTIONS " ]" +.B dpipe +.RB "{ " table " | " header " }" +.RI "{ " COMMAND " | " +.BR help " }" +.sp + +.ti -8 +.IR OPTIONS " := { " +\fB\-V\fR[\fIersion\fR] } + +.ti -8 +.BI "devlink dpipe table show " DEV +.R [ +.BI name " TABLE_NAME " +.R ] + +.ti -8 +.BI "devlink dpipe table set " DEV +.BI name " TABLE_NAME " + +.ti -8 +.BI "devlink dpipe table dump " DEV +.BI name " TABLE_NAME " + +.ti -8 +.BI "devlink dpipe header show " DEV + +.ti -8 +.B devlink dpipe help + +.SH "DESCRIPTION" +.SS devlink dpipe table show - display devlink dpipe table attributes + +.TP +.BI name " TABLE_NAME" +Specifies the table to operate on. + +.SS devlink dpipe table set - set devlink dpipe table attributes + +.TP +.BI name " TABLE_NAME" +Specifies the table to operate on. + +.SS devlink dpipe table dump - dump devlink dpipe table entries + +.TP +.BI name " TABLE_NAME" +Specifies the table to operate on. + +.SS devlink dpipe header show - display devlink dpipe header attributes + +.TP +.BI name " TABLE_NAME" +Specifies the table to operate on. + +.SH "EXAMPLES" +.PP +devlink dpipe table show pci/0000:01:00.0 +.RS 4 +Shows all dpipe tables on specified devlink device. +.RE +.PP +devlink dpipe table show pci/0000:01:00.0 name mlxsw_erif +.RS 4 +Shows mlxsw_erif dpipe table on specified devlink device. +.RE +.PP +devlink dpipe table set pci/0000:01:00.0 name mlxsw_erif counters_enabled true +.RS 4 +Turns on the counters on mlxsw_erif table. +.RE +.PP +devlink dpipe table dump pci/0000:01:00.0 name mlxsw_erif +.RS 4 +Dumps content of mlxsw_erif table. +.RE +.PP +devlink dpipe header show pci/0000:01:00.0 +.RS 4 +Shows all dpipe headers on specified devlink device. +.RE + +.SH SEE ALSO +.BR devlink (8), +.BR devlink-dev (8), +.BR devlink-monitor (8), +.br + +.SH AUTHOR +Jiri Pirko <[email protected]>
Signature · 1 line
2.21.1
Re: [patch iproute2/net-next 8/8] man: add man page for devlink dpipe
Quoted 31 lines · On Sat, 4 Apr 2020 18:16:21 +0200 Jiri Pirko <[email protected]> wrote:
From: Jiri Pirko <[email protected]>
Add simple man page for devlink dpipe.
Signed-off-by Jiri Pirko <[email protected]>--- man/man8/devlink-dpipe.8 | 100 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) create mode 100644 man/man8/devlink-dpipe.8man/man8/devlink-dpipe.8 new file +15
-0@@ -0,0 +1,100 @@ +.TH DEVLINK\-DPIPE 8 "4 Apr 2020" "iproute2" "Linux" +.SH NAME +devlink-dpipe \- devlink dataplane pipeline visualization +.SH SYNOPSIS +.sp +.ad l +.in +8 +.ti -8 +.B devlink +.RI "[ " OPTIONS " ]" +.B dpipe +.RB "{ " table " | " header " }" +.RI "{ " COMMAND " | " +.BR help " }" +.sp
man/man8/devlink-dpipe.8 line 25
Quoted 10 lines
man/man8/devlink-dpipe.8 new file +10
-0+ +.ti -8 +.IR OPTIONS " := { " +\fB\-V\fR[\fIersion\fR] } + +.ti -8 +.BI "devlink dpipe table show " DEV +.R [ +.BI name " TABLE_NAME " +.R ]
I applied the whole set, but fixed some issues on the man page. You had some trailing white space, and the .R macro is not the right way to do this. Make check runs a script from Debian and it spots that.
Re: [patch iproute2/net-next 8/8] man: add man page for devlink dpipe
Quoted 40 lines · Mon, Apr 06, 2020 at 07:30:36PM CEST, [email protected] wrote:
Quoted 37 lines · On Sat, 4 Apr 2020 18:16:21 +0200 Jiri Pirko <[email protected]> wrote:
From: Jiri Pirko <[email protected]>
Add simple man page for devlink dpipe.
Signed-off-by Jiri Pirko <[email protected]>--- man/man8/devlink-dpipe.8 | 100 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) create mode 100644 man/man8/devlink-dpipe.8man/man8/devlink-dpipe.8 new file +21
-0@@ -0,0 +1,100 @@ +.TH DEVLINK\-DPIPE 8 "4 Apr 2020" "iproute2" "Linux" +.SH NAME +devlink-dpipe \- devlink dataplane pipeline visualization +.SH SYNOPSIS +.sp +.ad l +.in +8 +.ti -8 +.B devlink +.RI "[ " OPTIONS " ]" +.B dpipe +.RB "{ " table " | " header " }" +.RI "{ " COMMAND " | " +.BR help " }" +.sp + +.ti -8 +.IR OPTIONS " := { " +\fB\-V\fR[\fIersion\fR] } + +.ti -8
Quoted 8 lines
man/man8/devlink-dpipe.8 line 25
Quoted 4 lines
man/man8/devlink-dpipe.8 new file +4
-0+.BI "devlink dpipe table show " DEV +.R [ +.BI name " TABLE_NAME " +.R ]I applied the whole set, but fixed some issues on the man page. You had some trailing white space, and the .R macro is not the right way to do this. Make check runs a script from Debian and it spots that.
Okay. I'll make sure to run this next time. I had no idea it checkes man. Thanks!
Quoted 16 lines · On Sat, 4 Apr 2020 18:16:13 +0200 Jiri Pirko <[email protected]> wrote:
From: Jiri Pirko <[email protected]>
This patchset contains couple of small fixes, consistency changes, help and man adjustments.
Jiri Pirko (8):
devlink: remove custom bool command line options parsing
devlink: Fix help and man of "devlink health set" command
devlink: fix encap mode manupulation
devlink: Add alias "counters_enabled" for "counters" option
devlink: renamedpipe_counters_enablestruct field to
dpipe_counters_enabled
devlink: Fix help message for dpipe
devlink: remove "dev" object sub help messages
man: add man page for devlink dpipe
Quoted 8 lines
bash-completion/devlink | 8 +-- devlink/devlink.c | 131 +++++++++++++++++--------------------- man/man8/devlink-dev.8 | 8 +-- man/man8/devlink-dpipe.8 | 100 +++++++++++++++++++++++++++++ man/man8/devlink-health.8 | 30 +++++---- 5 files changed, 181 insertions(+), 96 deletions(-) create mode 100644 man/man8/devlink-dpipe.8
Since these all don't depend on new kernel features, let me take them directly and skip net-next
Quoted 28 lines · Mon, Apr 06, 2020 at 04:21:09AM CEST, [email protected] wrote:
Quoted 16 lines · On Sat, 4 Apr 2020 18:16:13 +0200 Jiri Pirko <[email protected]> wrote:
From: Jiri Pirko <[email protected]>
This patchset contains couple of small fixes, consistency changes, help and man adjustments.
Jiri Pirko (8):
devlink: remove custom bool command line options parsing
devlink: Fix help and man of "devlink health set" command
devlink: fix encap mode manupulation
devlink: Add alias "counters_enabled" for "counters" option
devlink: renamedpipe_counters_enablestruct field to
dpipe_counters_enabled
devlink: Fix help message for dpipe
devlink: remove "dev" object sub help messages
man: add man page for devlink dpipeQuoted 8 lines
bash-completion/devlink | 8 +-- devlink/devlink.c | 131 +++++++++++++++++--------------------- man/man8/devlink-dev.8 | 8 +-- man/man8/devlink-dpipe.8 | 100 +++++++++++++++++++++++++++++ man/man8/devlink-health.8 | 30 +++++---- 5 files changed, 181 insertions(+), 96 deletions(-) create mode 100644 man/man8/devlink-dpipe.8
Quoted 2 lines
Since these all don't depend on new kernel features, let me take them directly and skip net-next
Okay.