commit a9be22425e767d936105679fdc9f568b97bd47cf
author Linus Torvalds <torvalds@linux-foundation.org> Sun Jun 15 16:37:03 2014 -1000
committer Linus Torvalds <torvalds@linux-foundation.org> Sun Jun 15 16:37:03 2014 -1000
tree 37a63136da83dcf272668462f96eed1e96f37de3
parent dd1845af24a47b70cf84c29126698884f740ff9c
parent b58537a1f5629bdc98a8b9dc2051ce0e952f6b4b

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Pull networking fixes from David Miller:

 1) Fix checksumming regressions, from Tom Herbert.

 2) Undo unintentional permissions changes for SCTP rto_alpha and
    rto_beta sysfs knobs, from Denial Borkmann.

 3) VXLAN, like other IP tunnels, should advertize it's encapsulation
    size using dev->needed_headroom instead of dev->hard_header_len.
    From Cong Wang.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
  net: sctp: fix permissions for rto_alpha and rto_beta knobs
  vxlan: Checksum fixes
  net: add skb_pop_rcv_encapsulation
  udp: call __skb_checksum_complete when doing full checksum
  net: Fix save software checksum complete
  net: Fix GSO constants to match NETIF flags
  udp: ipv4: do not waste time in __udp4_lib_mcast_demux_lookup
  vxlan: use dev->needed_headroom instead of dev->hard_header_len
  MAINTAINERS: update cxgb4 maintainer