1. 28 Sep, 2014 11 commits
  2. 15 Sep, 2014 1 commit
    • Stephen Hemminger's avatar
      update dsfield file values · eb5d01ff
      Stephen Hemminger authored
      Update the rt_dsfield file to contain values defined in current RFC.
      The days of TOS precedence are gone, even Cisco doesn't refer
      to these in the documents.
      eb5d01ff
  3. 04 Sep, 2014 2 commits
  4. 29 Aug, 2014 3 commits
  5. 04 Aug, 2014 9 commits
    • Stephen Hemminger's avatar
      Merge branch 'net-next' · cd635074
      Stephen Hemminger authored
      cd635074
    • Stephen Hemminger's avatar
      v3.16.0 · a9ae4224
      Stephen Hemminger authored
      a9ae4224
    • Jiri Pirko's avatar
      ff7c2084
    • Stephen Hemminger's avatar
      Update kernel headers to net-next · 945eaebd
      Stephen Hemminger authored
      945eaebd
    • Stephen Hemminger's avatar
      cleanup warnings · 656111b2
      Stephen Hemminger authored
      ll_index can return -1 but was declared unsigned.
      rt_addr_n2a had unused length parameter
      656111b2
    • Jay Vosburgh's avatar
      tc/netem: loss gemodel options fixes · 3757185b
      Jay Vosburgh authored
      First, the default value for 1-k is documented as being 0, but is
      currently being set to 1. (100%).  This causes all packets to be dropped
      in the good state if 1-k is not explicitly specified.  Fix this by setting
      the default to 0.
      
      	Second, the 1-h option is parsed correctly, however, the kernel is
      expecting "h", not 1-h.  Fix this by inverting the "1-h" percentage before
      sending to and after receiving from the kernel.  This does change the
      behavior, but makes it consistent with the netem documentation and the
      literature on the Gilbert-Elliot model, which refer to "1-h" and "1-k,"
      not "h" or "k" directly.
      
      	Last, fix a minor formatting issue for the options reporting.
      Signed-off-by: default avatarJay Vosburgh <jay.vosburgh@canonical.com>
      3757185b
    • Jamal Hadi Salim's avatar
      iproute2 bridge: bring to above par with brctl show macs · aeb14eb0
      Jamal Hadi Salim authored
      root@moja-mojo:bridge# ./bridge fdb help
      Usage: bridge fdb { add | append | del | replace } ADDR dev DEV {self|master} [ temp ]
                    [router] [ dst IPADDR] [ vlan VID ]
                    [ port PORT] [ vni VNI ] [via DEV]
             bridge fdb {show} [ br BRDEV ] [ brport DEV ]
      
       Lets start with two bridges each with a port...
      
      root@moja-mojo:bridge# ./bridge link
      10: sw1-p1 state DOWN : <BROADCAST,NOARP> mtu 1500 master sw1 state disabled priority 32 cost 100
      11: eth1 state DOWN : <BROADCAST,NOARP> mtu 1500 master br0 state disabled priority 32 cost 100
      
      show all...
      root@moja-mojo:bridge# ./bridge fdb show
      33:33:00:00:00:01 dev ifb0 self permanent
      33:33:00:00:00:01 dev ifb1 self permanent
      33:33:00:00:00:01 dev eth0 self permanent
      01:00:5e:00:00:01 dev eth0 self permanent
      33:33:ff:92:c0:60 dev eth0 self permanent
      33:33:00:00:00:fb dev eth0 self permanent
      01:00:5e:00:00:fb dev eth0 self permanent
      01:00:5e:7f:ff:fd dev eth0 self permanent
      01:00:5e:00:00:01 dev wlan0 self permanent
      33:33:00:00:00:01 dev wlan0 self permanent
      33:33:ff:c2:84:3b dev wlan0 self permanent
      33:33:00:00:00:fb dev wlan0 self permanent
      01:00:5e:00:00:01 dev virbr0 self permanent
      01:00:5e:00:00:fb dev virbr0 self permanent
      33:33:00:00:00:01 dev br0 self permanent
      33:33:00:00:00:01 dev sw1 self permanent
      33:33:00:00:00:01 dev dummy0 self permanent
      5e:f4:03:44:da:9a dev sw1-p1 vlan 0 master sw1 permanent
      33:33:00:00:00:01 dev sw1-p1 self permanent
      b6:5e:dd:ce:d7:5e dev eth1 vlan 0 master br0 permanent
      33:33:00:00:00:01 dev eth1 self permanent
      
      Lets see a netdev that is *not* attached to a bridge
      
      root@moja-mojo:bridge# ./bridge fdb show brport eth0
      33:33:00:00:00:01 self permanent
      01:00:5e:00:00:01 self permanent
      33:33:ff:92:c0:60 self permanent
      33:33:00:00:00:fb self permanent
      01:00:5e:00:00:fb self permanent
      01:00:5e:7f:ff:fd self permanent
      
      Lets see a netdev that is bridge port
      root@moja-mojo:bridge# ./bridge fdb show brport eth1
      hadi@jhs-1:/media/MT1/other-gits/iproute-jul04/bridge$ ./bridge fdb show brport eth1
      b6:5e:dd:ce:d7:5e vlan 0 master br0 permanent
      33:33:00:00:00:01 self permanent
      
      Specify the correct bridge and you get good stuff
      root@moja-mojo:bridge# ./bridge fdb show brport eth1 br br0
      6:5e:dd:ce:d7:5e vlan 0 master br0 permanent
      33:33:00:00:00:01 self permanent
      
      Specify the wrong bridge and you get good nada
      root@moja-mojo:bridge# ./bridge fdb show brport eth1 br sw1
      
      dump br0
      root@moja-mojo:bridge# ./bridge fdb show br br0
      33:33:00:00:00:01 dev br0 self permanent
      b6:5e:dd:ce:d7:5e dev eth1 vlan 0 master br0 permanent
      33:33:00:00:00:01 dev eth1 self permanent
      
      dump sw1
      root@moja-mojo:bridge# ./bridge fdb show br sw1
      33:33:00:00:00:01 dev sw1 self permanent
      5e:f4:03:44:da:9a dev sw1-p1 vlan 0 master sw1 permanent
      33:33:00:00:00:01 dev sw1-p1 self permanent
      
      Lets move a port from one bridge to another for shits-and-giggles
      (as the New Brunswickians like to say)
      root@moja-mojo:bridge# ip link set sw1-p1 master br0
      
      Now dump again br0
      root@moja-mojo:bridge# ./bridge fdb show br br0
      33:33:00:00:00:01 dev br0 self permanent
      5e:f4:03:44:da:9a dev sw1-p1 vlan 0 master br0 permanent
      33:33:00:00:00:01 dev sw1-p1 self permanent
      b6:5e:dd:ce:d7:5e dev eth1 vlan 0 master br0 permanent
      33:33:00:00:00:01 dev eth1 self permanent
      Signed-off-by: default avatarJamal Hadi Salim <jhs@mojatatu.com>
      aeb14eb0
    • Roopa Prabhu's avatar
      link dump filter · 50b9950d
      Roopa Prabhu authored
      This patch avoids a full link wildump request when the user has specified
      a single link. Uses RTM_GETLINK without the NLM_F_DUMP flag.
      
      This helps on a system with large number of interfaces.
      
      This patch currently only uses the link ifindex in the filter.
      Hoping to provide a subsequent kernel patch to do link dump filtering on
      other attributes in the kernel.
      
      In iplink_get, to be safe, this patch currently sets the answer buffer
      size to the max size that libnetlink rtnl_talk can copy. The current api
      does not seem to provide a way to indicate the answer buf size.
      
      changelog from RFC to v1:
          - incorporated comments from stephen (fixed comment and fixed if/else block)
      
      changelog from v1 to v2:
          - fix whitespaces error
      Signed-off-by: default avatarRoopa Prabhu <roopa@cumulusnetworks.com>
      50b9950d
    • Rami Rosen's avatar
      iplink: macvtap: fix man page · e4c35682
      Rami Rosen authored
      This patch adds description about macvtap to ip-link.8 man page.
      Signed-off-by: default avatarRami Rosen <ramirose@gmail.com>
      e4c35682
  6. 15 Jul, 2014 5 commits
    • Dmitry Popov's avatar
      fix ip tunnel for vti tunnels with ikey · 23d526c4
      Dmitry Popov authored
      Consider the following command:
      
      ip tunnel add mode vti remote 12.0.0.1 local 12.0.0.3 ikey 15
      
      i_flags will be GRE_KEY|VTI_ISVTI. So, in order to distinguish between ipip and
      vti we have to check just VTI_ISVTI bit, not the equality of i_flags and
      VTI_ISVTI.
      
      * Note, that there also was a bug in ip_tunnel/ip_vti, see
      commit 7c8e6b9c281(ip_vti: Fix 'ip tunnel add' with 'key' parameters),
      https://lkml.org/lkml/2014/6/7/125.
      Even patched iproute could be unable to create vti tunnels with non-zero keys.
      
      1) Unpatched iproute2:
      [root@vm ~]# ip tunnel show
      [root@vm ~]# lsmod | egrep '(ipip|vti)'
      [root@vm ~]# ip tunnel add mode vti ikey 1
      [root@vm ~]# lsmod | egrep '(ipip|vti)'
      ipip                    4197  0 
      tunnel4                 1659  1 ipip
      ip_tunnel               9295  1 ipip
      [root@vm ~]# ip tunnel show
      tunl0: ip/ip  remote any  local any  ttl inherit
      [root@vm ~]# ip tunnel add mode vti remote 1.2.3.4 ikey 2
      [root@vm ~]# ip tunnel show
      ipip0: ip/ip  remote 1.2.3.4  local any  ttl inherit 
      tunl0: ip/ip  remote any  local any  ttl inherit 
      [root@vm ~]# lsmod | egrep '(ipip|vti)'
      ipip                    4197  0 
      tunnel4                 1659  1 ipip
      ip_tunnel               9295  1 ipip
      
      # ipip tunnels are created instead of vti
      
      2) Patched iproute2:
      [root@vm ~]# ip tunnel show
      [root@vm ~]# lsmod | egrep '(ipip|vti)'
      [root@vm ~]# ip tunnel add mode vti ikey 1
      [root@vm ~]# lsmod | egrep '(ipip|vti)'
      ip_vti                  5258  0 
      ip_tunnel               9295  1 ip_vti
      [root@vm ~]# ip tunnel show
      vti0: ip/ip  remote any  local any  ttl inherit  ikey 1  okey 0 
      ip_vti0: ip/ip  remote any  local any  ttl inherit  nopmtudisc key 0
      [root@vm ~]# ip tunnel add mode vti remote 1.2.3.4 ikey 2
      [root@vm ~]# ip tunnel show
      vti0: ip/ip  remote any  local any  ttl inherit  ikey 1  okey 0
      vti1: ip/ip  remote 1.2.3.4  local any  ttl inherit  ikey 2  okey 0 
      ip_vti0: ip/ip  remote any  local any  ttl inherit  nopmtudisc key 0
      
      # Vti tunnels are created as expected
      # * If you have unpatched kernel your vti tunnels will have ikey == okey == 0
      
      Same story exists with ip tunnel show/del with non-zero [io]key: requests are 
      routed to tunl0 instead of ip_vti0.
      Signed-off-by: default avatarDmitry Popov <ixaphire@qrator.net>
      23d526c4
    • Vasily Averin's avatar
      ipnetns: fixed typo "seting" -> "setTing" · 31962449
      Vasily Averin authored
      Signed-off-by: default avatarVasily Averin <vvs@openvz.org>
      31962449
    • Daniel Borkmann's avatar
      man: token: fix couple of typos · cd509528
      Daniel Borkmann authored
      Not sure how these typos slipped in back then, I suspect
      too much coffee. ;) So lets fix them up properly.
      Signed-off-by: default avatarDaniel Borkmann <dborkman@redhat.com>
      cd509528
    • vadimk's avatar
      ip: Added missing usage for netconf object · cfea8b35
      vadimk authored
      cfea8b35
    • Masatake YAMATO's avatar
      ip: add nlmon as a device type to help message · 7968262d
      Masatake YAMATO authored
      Though nlmon device can be added, it was not listed
      in the output of "ip link help".
      Signed-off-by: default avatarMasatake YAMATO <yamato@redhat.com>
      Acked-by: default avatarDaniel Borkmann <dborkman@redhat.com>
      7968262d
  7. 14 Jul, 2014 3 commits
  8. 10 Jun, 2014 2 commits
  9. 09 Jun, 2014 4 commits
    • Roopa Prabhu's avatar
      bridge: Add master device name to bridge fdb show · cc273a51
      Roopa Prabhu authored
      This patch adds master dev name from NDA_MASTER netlink attribute
       to bridge fdb show output
      
      current iproute2 tries to print 'master' in the output if NTF_MASTER
      is present. But, kernel today does not set NTF_MASTER during dump
      requests. Which means I have not seen iproute2 bridge cmd print 'master' atall.
      This patch overrides the NTF_MASTER flag if NDA_MASTER attribute is present.
      
      Example output:
      
      before this patch:
      # bridge fdb show
      44:38:39:00:27:ba dev bond2.2003 permanent
      44:38:39:00:27:bb dev bond4.2003 permanent
      44:38:39:00:27:bc dev bond2.2004 permanent
      
      After this patch:
      # bridge fdb show
      44:38:39:00:27:ba dev bond2.2003 master br-2003 permanent
      44:38:39:00:27:bb dev bond4.2003 master br-2003 permanent
      44:38:39:00:27:bc dev bond2.2004 master br-2004 permanent
      
      For comparision with the above, below is the output for NTF_SELF today,
      # bridge fdb show
      33:33:00:00:00:01 dev eth0 self permanent
      01:00:5e:00:00:01 dev eth0 self permanent
      33:33:ff:00:01:cc dev eth0 self permanent
      
      If change in output is a concern, 'master' can be put at the end of the fdb
      output line or made optional with -d[etails] option.
      
      change from v1 to v2:
          use 'bridge' instead of 'master' in fdb show output
      
      change from v2 to v3:
          use 'master' instead of 'bridge' in fdb show output
          (master could also be a vxlan device)
      Signed-off-by: default avatarWilson Kok <wkok@cumulusnetworks.com>
      Signed-off-by: default avatarRoopa Prabhu <roopa@cumulusnetworks.com>
      cc273a51
    • Sucheta Chakraborty's avatar
      Add support to configure SR-IOV VF minimum and maximum Tx rate through ip tool · f89a2a05
      Sucheta Chakraborty authored
      o "min_tx_rate" option has been added for minimum Tx rate. Hence, for
        consistent naming, "max_tx_rate" option has been introduced for maximum
        Tx rate.
      
      o Change in v2: "rate" can be used along with "max_tx_rate".
        When both are specified, "max_tx_rate" should override.
      
      o Change in v3:
        * IFLA_VF_RATE: When IFLA_VF_RATE is used, and user has given only one of
          min_tx_rate or max_tx_rate, reading of previous rate limits is done in
          userspace instead of in kernel space before ndo_set_vf_rate.
      
        * IFLA_VF_TX_RATE: When IFLA_VF_TX_RATE is used, min_tx_rate is always read
          in kernel space. This takes care of below scenarios:
          (1) when old tool sends "rate" but kernel is new (expects min and max)
          (2) when new tool sends only "rate" but kernel is old (expects only "rate")
      
      o Change in v4 as suggested by Stephen Hemminger:
        * As per iproute policy, input and output formats should match. Changing display
          of max_tx_rate and min_tx_rate options accordingly.
      	./ip/ip link show p3p1
      	8: p3p1: <BROADCAST,MULTICAST> mtu 1500 qdisc noop state DOWN mode DEFAULT qlen 1000
              link/ether 00:0e:1e:16:ce:40 brd ff:ff:ff:ff:ff:ff
              vf 0 MAC 2a:18:8f:4d:3d:d4, tx rate 700 (Mbps), max_tx_rate 700Mbps, min_tx_rate 200Mbps
              vf 1 MAC 72:dc:ba:f9:df:fd
      Signed-off-by: default avatarSucheta Chakraborty <sucheta.chakraborty@qlogic.com>
      f89a2a05
    • Stephen Hemminger's avatar
      Update to current net-next kernel headers · fd5c1d43
      Stephen Hemminger authored
      Update sanitized headers
      fd5c1d43
    • Jiri Pirko's avatar