• L
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · 609eb39c
    Linus Torvalds 提交于
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (47 commits)
      [SCTP]: Fix local_addr deletions during list traversals.
      net: fix build with CONFIG_NET=n
      [TCP]: Prevent sending past receiver window with TSO (at last skb)
      rt2x00: Add new D-Link USB ID
      rt2x00: never disable multicast because it disables broadcast too
      libertas: fix the 'compare command with itself' properly
      drivers/net/Kconfig: fix whitespace for GELIC_WIRELESS entry
      [NETFILTER]: nf_queue: don't return error when unregistering a non-existant handler
      [NETFILTER]: nfnetlink_queue: fix EPERM when binding/unbinding and instance 0 exists
      [NETFILTER]: nfnetlink_log: fix EPERM when binding/unbinding and instance 0 exists
      [NETFILTER]: nf_conntrack: replace horrible hack with ksize()
      [NETFILTER]: nf_conntrack: add \n to "expectation table full" message
      [NETFILTER]: xt_time: fix failure to match on Sundays
      [NETFILTER]: nfnetlink_log: fix computation of netlink skb size
      [NETFILTER]: nfnetlink_queue: fix computation of allocated size for netlink skb.
      [NETFILTER]: nfnetlink: fix ifdef in nfnetlink_compat.h
      [NET]: include <linux/types.h> into linux/ethtool.h for __u* typedef
      [NET]: Make /proc/net a symlink on /proc/self/net (v3)
      RxRPC: fix rxrpc_recvmsg()'s returning of msg_name
      net/enc28j60: oops fix
      ...
    609eb39c
base.c 67.5 KB