1. 29 Sep, 2015 32 commits
  2. 28 Sep, 2015 1 commit
  3. 27 Sep, 2015 5 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
    • David Woodhouse's avatar
      8139cp: Enable offload features by default · 5a58f227
      David Woodhouse authored
      I fixed TSO. Hardware checksum and scatter/gather also appear to be
      working correctly both on real hardware and in QEMU's emulation.
      
      Let's enable them by default and see if anyone screams...
      Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      5a58f227
  4. 26 Sep, 2015 2 commits
    • David S. Miller's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 4963ed48
      David S. Miller authored
      Conflicts:
      	net/ipv4/arp.c
      
      The net/ipv4/arp.c conflict was one commit adding a new
      local variable while another commit was deleting one.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      4963ed48
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 518a7cb6
      Linus Torvalds authored
      Pull networking fixes from David Miller:
      
       1) When we run a tap on netlink sockets, we have to copy mmap'd SKBs
          instead of cloning them.  From Daniel Borkmann.
      
       2) When converting classical BPF into eBPF, fix the setting of the
          source reg to BPF_REG_X.  From Tycho Andersen.
      
       3) Fix igmpv3/mldv2 report parsing in the bridge multicast code, from
          Linus Lussing.
      
       4) Fix dst refcounting for ipv6 tunnels, from Martin KaFai Lau.
      
       5) Set NLM_F_REPLACE flag properly when replacing ipv6 routes, from
          Roopa Prabhu.
      
       6) Add some new cxgb4 PCI device IDs, from Hariprasad Shenai.
      
       7) Fix headroom tests and SKB leaks in ipv6 fragmentation code, from
          Florian Westphal.
      
       8) Check DMA mapping errors in bna driver, from Ivan Vecera.
      
       9) Several 8139cp bug fixes (dev_kfree_skb_any in interrupt context,
          misclearing of interrupt status in TX timeout handler, etc.) from
          David Woodhouse.
      
      10) In tipc, reset SKB header pointer after skb_linearize(), from Erik
          Hugne.
      
      11) Fix autobind races et al. in netlink code, from Herbert Xu with
          help from Tejun Heo and others.
      
      12) Missing SET_NETDEV_DEV in sunvnet driver, from Sowmini Varadhan.
      
      13) Fix various races in timewait timer and reqsk_queue_hadh_req, from
          Eric Dumazet.
      
      14) Fix array overruns in mac80211, from Johannes Berg and Dan
          Carpenter.
      
      15) Fix data race in rhashtable_rehash_one(), from Dmitriy Vyukov.
      
      16) Fix race between poll_one_napi and napi_disable, from Neil Horman.
      
      17) Fix byte order in geneve tunnel port config, from John W Linville.
      
      18) Fix handling of ARP replies over lightweight tunnels, from Jiri
          Benc.
      
      19) We can loop when fib rule dumps cross multiple SKBs, fix from Wilson
          Kok and Roopa Prabhu.
      
      20) Several reference count handling bug fixes in the PHY/MDIO layer
          from Russel King.
      
      21) Fix lockdep splat in ppp_dev_uninit(), from Guillaume Nault.
      
      22) Fix crash in icmp_route_lookup(), from David Ahern.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (116 commits)
        net: Fix panic in icmp_route_lookup
        net: update docbook comment for __mdiobus_register()
        ppp: fix lockdep splat in ppp_dev_uninit()
        net: via/Kconfig: GENERIC_PCI_IOMAP required if PCI not selected
        phy: marvell: add link partner advertised modes
        net: fix net_device refcounting
        phy: add phy_device_remove()
        phy: fixed-phy: properly validate phy in fixed_phy_update_state()
        net: fix phy refcounting in a bunch of drivers
        of_mdio: fix MDIO phy device refcounting
        phy: add proper phy struct device refcounting
        phy: fix mdiobus module safety
        net: dsa: fix of_mdio_find_bus() device refcount leak
        phy: fix of_mdio_find_bus() device refcount leak
        ip6_tunnel: Reduce log level in ip6_tnl_err() to debug
        ip6_gre: Reduce log level in ip6gre_err() to debug
        fib_rules: fix fib rule dumps across multiple skbs
        bnx2x: byte swap rss_key to comply to Toeplitz specs
        net: revert "net_sched: move tp->root allocation into fw_init()"
        lwtunnel: remove source and destination UDP port config option
        ...
      518a7cb6