proxmox-mirrors/mirror_iproute2
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_iproute2 synced 2025-10-10 16:43:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into net-next

Browse Source
This commit is contained in:
Stephen Hemminger 2016-03-02 09:27:09 -08:00
commit 240b3573f7
3 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ip/iplink.c
View File

@ -82,6 +82,7 @@ void iplink_usage(void)
fprintf(stderr, " [ spoofchk { on | off} ] ]\n"); fprintf(stderr, " [ spoofchk { on | off} ] ]\n");
fprintf(stderr, " [ query_rss { on | off} ] ]\n"); fprintf(stderr, " [ query_rss { on | off} ] ]\n");
fprintf(stderr, " [ state { auto | enable | disable} ] ]\n"); fprintf(stderr, " [ state { auto | enable | disable} ] ]\n");
fprintf(stderr, " [ trust { on | off} ] ]\n");
fprintf(stderr, " [ master DEVICE ]\n"); fprintf(stderr, " [ master DEVICE ]\n");
fprintf(stderr, " [ nomaster ]\n"); fprintf(stderr, " [ nomaster ]\n");
fprintf(stderr, " [ addrgenmode { eui64 | none | stable_secret | random } ]\n"); fprintf(stderr, " [ addrgenmode { eui64 | none | stable_secret | random } ]\n");
@ -356,6 +357,18 @@ static int iplink_parse_vf(int vf, int *argcp, char ***argvp,
ivs.vf = vf; ivs.vf = vf;
addattr_l(&req->n, sizeof(*req), IFLA_VF_RSS_QUERY_EN, &ivs, sizeof(ivs)); addattr_l(&req->n, sizeof(*req), IFLA_VF_RSS_QUERY_EN, &ivs, sizeof(ivs));
} else if (matches(*argv, "trust") == 0) {
struct ifla_vf_trust ivt;
NEXT_ARG();
if (matches(*argv, "on") == 0)
ivt.setting = 1;
else if (matches(*argv, "off") == 0)
ivt.setting = 0;
else
invarg("Invalid \"trust\" value\n", *argv);
ivt.vf = vf;
addattr_l(&req->n, sizeof(*req), IFLA_VF_TRUST, &ivt, sizeof(ivt));
} else if (matches(*argv, "state") == 0) { } else if (matches(*argv, "state") == 0) {
struct ifla_vf_link_state ivl; struct ifla_vf_link_state ivl;

5
ip/iprule.c
View File

@ -33,8 +33,9 @@ static void usage(void) __attribute__((noreturn));
static void usage(void) static void usage(void)
{ {
fprintf(stderr, "Usage: ip rule [ list | add | del | flush | save ] SELECTOR ACTION\n"); fprintf(stderr, "Usage: ip rule { add | del } SELECTOR ACTION\n");
fprintf(stderr, " ip rule restore\n"); fprintf(stderr, " ip rule { flush | save | restore }\n");
fprintf(stderr, " ip rule [ list ]\n");
fprintf(stderr, "SELECTOR := [ not ] [ from PREFIX ] [ to PREFIX ] [ tos TOS ] [ fwmark FWMARK[/MASK] ]\n"); fprintf(stderr, "SELECTOR := [ not ] [ from PREFIX ] [ to PREFIX ] [ tos TOS ] [ fwmark FWMARK[/MASK] ]\n");
fprintf(stderr, " [ iif STRING ] [ oif STRING ] [ pref NUMBER ]\n"); fprintf(stderr, " [ iif STRING ] [ oif STRING ] [ pref NUMBER ]\n");
fprintf(stderr, "ACTION := [ table TABLE_ID ]\n"); fprintf(stderr, "ACTION := [ table TABLE_ID ]\n");

7
man/man8/ip-link.8.in
View File

@ -142,7 +142,8 @@ ip-link \- network device configuration
.B min_tx_rate .B min_tx_rate
.IR TXRATE " ] [" .IR TXRATE " ] ["
.B spoofchk { on | off } ] [ .B spoofchk { on | off } ] [
.B state { auto | enable | disable} .B state { auto | enable | disable} ] [
.B trust { on | off }
] | ] |
.br .br
.B master .B master
@ -1019,6 +1020,10 @@ parameter must be specified.
reflection of the PF link state, enable lets the VF to communicate with other VFs on reflection of the PF link state, enable lets the VF to communicate with other VFs on
this host even if the PF link state is down, disable causes the HW to drop any packets this host even if the PF link state is down, disable causes the HW to drop any packets
sent by the VF. sent by the VF.
.sp
.BI trust " on|off"
- trust the specified VF user. This enables that VF user can set a specific feature
which may impact security and/or performance. (e.g. VF multicast promiscuous mode)
.in -8 .in -8
.TP .TP