1. 29 Sep, 2015 35 commits
  2. 28 Sep, 2015 1 commit
  3. 27 Sep, 2015 4 commits
    • David S. Miller's avatar
      Merge branch 'vxlan-ipv4-ipv6' · 8f350437
      David S. Miller authored
      Jiri Benc says:
      
      ====================
      vxlan: support both IPv4 and IPv6 sockets
      
      Note: this needs net merged into net-next in order to apply.
      
      It's currently not easy enough to work with metadata based vxlan tunnels. In
      particular, it's necessary to create separate network interfaces for IPv4
      and IPv6 tunneling. Assigning an IPv6 address to an IPv4 interface is
      allowed yet won't do what's expected. With route based tunneling, one has to
      pay attention to use the vxlan interface opened with the correct family.
      Other users of this (openvswitch) would need to always create two vxlan
      interfaces.
      
      Furthermore, there's no sane API for creating an IPv6 vxlan metadata based
      interface.
      
      This patchset simplifies this by opening both IPv4 and IPv6 socket if the
      vxlan interface has the metadata flag (IFLA_VXLAN_COLLECT_METADATA) set.
      Assignment of addresses etc. works as expected after this.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      8f350437
    • Jiri Benc's avatar
      vxlan: support both IPv4 and IPv6 sockets in a single vxlan device · b1be00a6
      Jiri Benc authored
      For metadata based vxlan interface, open both IPv4 and IPv6 socket. This is
      much more user friendly: it's not necessary to create two vxlan interfaces
      and pay attention to using the right one in routing rules.
      Signed-off-by: default avatarJiri Benc <jbenc@redhat.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      b1be00a6
    • Jiri Benc's avatar
      vxlan: make vxlan_sock_add and vxlan_sock_release complementary · 205f356d
      Jiri Benc authored
      Make vxlan_sock_add both alloc the socket and attach it to vxlan_dev. Let
      vxlan_sock_release accept vxlan_dev as its parameter instead of vxlan_sock.
      
      This makes vxlan_sock_add and vxlan_sock release complementary. It reduces
      code duplication in the next patch.
      Signed-off-by: default avatarJiri Benc <jbenc@redhat.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      205f356d
    • David Woodhouse's avatar
      8139cp: Fix GSO MSS handling · 8b7a7048
      David Woodhouse authored
      When fixing the TSO support I noticed we just mask ->gso_size with the
      MSSMask value and don't care about the consequences.
      
      Provide a .ndo_features_check() method which drops the NETIF_F_TSO
      feature for any skb which would exceed the maximum, and thus forces it
      to be segmented by software.
      
      Then we can stop the masking in cp_start_xmit(), and just WARN if the
      maximum is exceeded, which should now never happen.
      
      Finally, Francois Romieu noticed that we didn't even have the right
      value for MSSMask anyway; it should be 0x7ff (11 bits) not 0xfff.
      Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      8b7a7048