linux-toradex.git/net, branch v2.6.39-rc5

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

2011-04-19T22:16:41+00:00

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (51 commits)
  netfilter: ipset: Fix the order of listing of sets
  ip6_pol_route panic: Do not allow VLAN on loopback
  bnx2x: Fix port identification problem
  r8169: add Realtek as maintainer.
  ip: ip_options_compile() resilient to NULL skb route
  bna: fix memory leak during RX path cleanup
  bna: fix for clean fw re-initialization
  usbnet: Fix up 'FLAG_POINTTOPOINT' and 'FLAG_MULTI_PACKET' overlaps.
  iwlegacy: fix tx_power initialization
  Revert "tcp: disallow bind() to reuse addr/port"
  qlcnic: limit skb frags for non tso packet
  net: can: mscan: fix build breakage in mpc5xxx_can
  netfilter: ipset: set match and SET target fixes
  netfilter: ipset: bitmap:ip,mac type requires "src" for MAC
  sctp: fix oops while removed transport still using as retran path
  sctp: fix oops when updating retransmit path with DEBUG on
  net: Disable NETIF_F_TSO_ECN when TSO is disabled
  net: Disable all TSO features when SG is disabled
  sfc: Use rmb() to ensure reads occur in order
  ieee802154: Remove hacked CFLAGS in net/ieee802154/Makefile
  ...

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6

2011-04-19T18:28:35+00:00

netfilter: ipset: Fix the order of listing of sets

2011-04-19T13:59:15+00:00

A restoreable saving of sets requires that list:set type of sets
come last and the code part which should have taken into account
the ordering was broken. The patch fixes the listing order.

Signed-off-by: Jozsef Kadlecsik 
Signed-off-by: Patrick McHardy

net/9p: nwname should be an unsigned int

2011-04-15T20:26:15+00:00

Signed-off-by: Harsh Prateek Bora 
Signed-off-by: Venkateswararao Jujjuri 
Signed-off-by: Eric VAn Hensbergen

9p: Fix sparse error

2011-04-15T20:26:14+00:00

Signed-off-by: Aneesh Kumar K.V 
Signed-off-by: Venkateswararao Jujjuri 
Signed-off-by: Eric Van Hensbergen

9p: revert tsyncfs related changes

2011-04-15T20:26:14+00:00

Now that we use write_inode to flush server
cache related to fid, we don't need tsyncfs either fort dotl or dotu
protocols. For dotu this helps to do a more efficient server flush.

Signed-off-by: Aneesh Kumar K.V 
Signed-off-by: Venkateswararao Jujjuri 
Signed-off-by: Eric Van Hensbergen

ip: ip_options_compile() resilient to NULL skb route

2011-04-15T06:26:02+00:00

Scot Doyle demonstrated ip_options_compile() could be called with an skb
without an attached route, using a setup involving a bridge, netfilter,
and forged IP packets.

Let's make ip_options_compile() and ip_options_rcv_srr() a bit more
robust, instead of changing bridge/netfilter code.

With help from Hiroaki SHIMODA.

Reported-by: Scot Doyle 
Tested-by: Scot Doyle 
Signed-off-by: Eric Dumazet 
Cc: Stephen Hemminger 
Acked-by: Hiroaki SHIMODA 
Signed-off-by: David S. Miller

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client

2011-04-15T02:02:55+00:00

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
  libceph: fix linger request requeueing

Revert "tcp: disallow bind() to reuse addr/port"

2011-04-13T19:01:14+00:00

This reverts commit c191a836a908d1dd6b40c503741f91b914de3348.

It causes known regressions for programs that expect to be able to use
SO_REUSEADDR to shutdown a socket, then successfully rebind another
socket to the same ID.

Programs such as haproxy and amavisd expect this to work.

This should fix kernel bugzilla 32832.

Signed-off-by: David S. Miller

netfilter: ipset: set match and SET target fixes

2011-04-13T11:45:57+00:00

The SET target with --del-set did not work due to using wrongly
the internal dimension of --add-set instead of --del-set.
Also, the checkentries did not release the set references when
returned an error. Bugs reported by Lennert Buytenhek.

Signed-off-by: Jozsef Kadlecsik 
Signed-off-by: Patrick McHardy