← Back to branch summary

~ubuntu-branches/ubuntu/trusty/iproute/trusty-proposed

« back to all changes in this revision

Viewing changes to tc/em_meta.c

  • Committer: Bazaar Package Importer
  • Author(s): Alexander Wirt, Andreas Henriksson, Justin B Rye, Alexander Wirt
  • Date: 2008-05-11 11:18:29 UTC
  • mfrom: (1.1.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20080511111829-rfewew7s6kiev0bh
Tags: 20080417-1
http://bugs.debian.org/467557
http://bugs.debian.org/480173
http://bugs.debian.org/464521
[ Andreas Henriksson ]
* New upstream release, v2.6.25 a.k.a. snapshot 20080417.
  - Initial documentation for xfrm (Partially fixes #451337)
  - Fixes manpage error caught by lintian!
* Fix typos (syntax error) in ip(8) manpage.
  - Introduced by upstream, caught by lintian yet again!
* Don't ship useless headers in iproute-dev (Closes: #467557)
* Cherry-pick "Fix bad hash calculation because of signed address" from
  upstream. (Closes: #480173)

[ Justin B Rye ]
* Update package description (Closes: #464521)

[ Alexander Wirt ]
* Fix typo in short package description.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tc/em_meta.c
34
34
            "       META_ID := id [ shift SHIFT ] [ mask MASK ]\n" \
35
35
            "\n" \
36
36
            "Example: meta(nfmark gt 24)\n" \
37
 
            "         meta(indev shift 1 eq \"ppp\"\n" \
 
37
            "         meta(indev shift 1 eq \"ppp\")\n" \
38
38
            "         meta(tcindex mask 0xf0 eq 0xf0)\n" \
39
 
            "         meta(dev eq indev)\n" \
40
39
            "\n" \
41
40
            "For a list of meta identifiers, use meta(list).\n");
42
41
}
89
88
                                "Routing ClassID (cls_route)"),
90
89
        __A(RTIIF,              "rt_iif",       "i",
91
90
                                "Incoming interface index"),
 
91
        __A(VLAN_TAG,           "vlan",         "i",    "Vlan tag"),
92
92
 
93
93
        __A(SECTION,            "Sockets", "", ""),
94
94
        __A(SK_FAMILY,          "sk_family",    "i",    "Address family"),