~ubuntu-branches/ubuntu/raring/iproute/raring-proposed

« back to all changes in this revision

Viewing changes to .pc/moo.diff/ip/ip.c

  • Committer: Package Import Robot
  • Author(s): Colin Watson
  • Date: 2012-05-22 14:10:07 UTC
  • mfrom: (1.1.15) (23.1.9 sid)
  • Revision ID: package-import@ubuntu.com-20120522141007-uuwicj2cx2x71vfb
Tags: 20120319-1ubuntu1
* Resynchronise with Debian.  Remaining changes:
  - Mark iproute as Multi-Arch: foreign.
  - Add cross-building support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
45
45
"       ip [ -force ] -batch filename\n"
46
46
"where  OBJECT := { link | addr | addrlabel | route | rule | neigh | ntable |\n"
47
47
"                   tunnel | tuntap | maddr | mroute | mrule | monitor | xfrm |\n"
48
 
"                   netns }\n"
 
48
"                   netns | l2tp }\n"
49
49
"       OPTIONS := { -V[ersion] | -s[tatistics] | -d[etails] | -r[esolve] |\n"
50
50
"                    -f[amily] { inet | inet6 | ipx | dnet | link } |\n"
51
51
"                    -l[oops] { maximum-addr-flush-attempts } |\n"
73
73
        { "ntable",     do_ipntable },
74
74
        { "ntbl",       do_ipntable },
75
75
        { "link",       do_iplink },
 
76
        { "l2tp",       do_ipl2tp },
76
77
        { "tunnel",     do_iptunnel },
77
78
        { "tunl",       do_iptunnel },
78
79
        { "tuntap",     do_iptuntap },