diff options
| author | David Ahern <dsahern@kernel.org> | 2022-12-16 09:12:38 -0700 |
|---|---|---|
| committer | David Ahern <dsahern@kernel.org> | 2022-12-16 09:12:38 -0700 |
| commit | 3715a146e813745ed14cc1cf8cdd527495832c9e (patch) | |
| tree | 326bf53ce4125038bfbc86821f7b115ae7d3bc94 /man | |
| parent | 19b358e1ded31189f6081ee7668d003a49ebf96b (diff) | |
| parent | 83699d3d5077bbb3957030938f746601317767d2 (diff) | |
| download | iproute2-3715a146e813745ed14cc1cf8cdd527495832c9e.tar.gz | |
Merge branch 'main' into next
Conflicts:
devlink/devlink.c
Signed-off-by: David Ahern <dsahern@kernel.org>
Diffstat (limited to 'man')
| -rw-r--r-- | man/man8/ip-link.8.in | 6 | ||||
| -rw-r--r-- | man/man8/tc.8 | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/man/man8/ip-link.8.in b/man/man8/ip-link.8.in index 235c839a..4956220b 100644 --- a/man/man8/ip-link.8.in +++ b/man/man8/ip-link.8.in @@ -43,6 +43,8 @@ ip-link \- network device configuration .br .RB "[ " gro_max_size .IR BYTES " ]" +.RB "[ " netns " {" +.IR PID " | " NETNSNAME " } ]" .br .BI type " TYPE" .RI "[ " ARGS " ]" @@ -438,6 +440,10 @@ specifies the desired index of the new virtual device. The link creation fails, if the index is busy. .TP +.BI netns " { PID | NAME } " +specifies the desired network namespace to create interface in. + +.TP VLAN Type Support For a link of type .I VLAN diff --git a/man/man8/tc.8 b/man/man8/tc.8 index d9d80964..2969fb55 100644 --- a/man/man8/tc.8 +++ b/man/man8/tc.8 @@ -21,7 +21,7 @@ tc \- show / manipulate traffic control settings .B tc .RI "[ " OPTIONS " ]" -.B class [ add | change | replace | delete ] dev +.B class [ add | change | replace | delete | show ] dev \fIDEV\fR .B parent \fIqdisc-id\fR |