matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2

This commit is contained in:
Stephen Hemminger 2008-09-15 11:56:06 -07:00
parent afd5dad9f3 a908898c18
commit f8fa979bd9
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
etc/iproute2/rt_dsfield
View File

@ -12,3 +12,16 @@
0xa0 critical 0xa0 critical
0xc0 internet 0xc0 internet
0xe0 network 0xe0 network
# Newer RFC2597 values
0x28 AF11
0x30 AF12
0x38 AF13
0x48 AF21
0x50 AF22
0x58 AF23
0x68 AF31
0x70 AF32
0x78 AF33
0x88 AF41
0x90 AF42
0x98 AF43

5
man/man8/ip.8
View File

@ -2164,19 +2164,16 @@ flag is equivalent to the combination
.B It isn't work. Don't use it. .B It isn't work. Don't use it.
.TP .TP
.RP .BR "dscp inherit"
.BI dscp inherit
.RB ( " only IPv6 tunnels " ) .RB ( " only IPv6 tunnels " )
Inherit DS field between inner and outer header. Inherit DS field between inner and outer header.
.TP .TP
.RP
.BI encaplim " ELIM" .BI encaplim " ELIM"
.RB ( " only IPv6 tunnels " ) .RB ( " only IPv6 tunnels " )
set a fixed encapsulation limit. Default is 4. set a fixed encapsulation limit. Default is 4.
.TP .TP
.RP
.BI flowlabel " FLOWLABEL" .BI flowlabel " FLOWLABEL"
.RB ( " only IPv6 tunnels " ) .RB ( " only IPv6 tunnels " )
set a fixed flowlabel. set a fixed flowlabel.

6
tc/em_meta.c
View File

@ -262,7 +262,7 @@ parse_object(struct bstr *args, struct bstr *arg, struct tcf_meta_val *obj,
} }
num = bstrtoul(arg); num = bstrtoul(arg);
if (num != LONG_MAX) { if (num != ULONG_MAX) {
obj->kind = TCF_META_TYPE_INT << 12; obj->kind = TCF_META_TYPE_INT << 12;
obj->kind |= TCF_META_ID_VALUE; obj->kind |= TCF_META_ID_VALUE;
*dst = (unsigned long) num; *dst = (unsigned long) num;
@ -320,7 +320,7 @@ compatible:
a = bstr_next(a); a = bstr_next(a);
shift = bstrtoul(a); shift = bstrtoul(a);
if (shift == LONG_MAX) { if (shift == ULONG_MAX) {
PARSE_ERR(a, "meta: invalid shift, must " \ PARSE_ERR(a, "meta: invalid shift, must " \
"be numeric"); "be numeric");
return PARSE_FAILURE; return PARSE_FAILURE;
@ -338,7 +338,7 @@ compatible:
a = bstr_next(a); a = bstr_next(a);
mask = bstrtoul(a); mask = bstrtoul(a);
if (mask == LONG_MAX) { if (mask == ULONG_MAX) {
PARSE_ERR(a, "meta: invalid mask, must be " \ PARSE_ERR(a, "meta: invalid mask, must be " \
"numeric"); "numeric");
return PARSE_FAILURE; return PARSE_FAILURE;