into nuts.davemloft.net:/disk1/BK/net-2.6

Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: David S. Miller <davem@davemloft.net>

This patch fixes a bug in the DECnet connect that seems to have been in 2.6 for
a while now.

If a connection is rejected by a remote host (eg invalid access control, no
such object etc) the Linux end hangs in connect() because it is only waiting for
the socket to go into RUN state.

This patch sets the ECONNREFUSED error state on the socket when the connection
is rejected to that the connect() exits it's wait loop and returns the error to
the user.
Signed-off-by: David S. Miller <davem@davemloft.net>

This typo annoyned me several times by not showing up in greps.
Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Christian Ehrhardt <ehrhardt@mathematik.uni-ulm.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: David S. Miller <davem@davemloft.net>

into nuts.davemloft.net:/disk1/BK/net-2.6

Signed-off-by: David S. Miller <davem@davemloft.net>

Since skb_checksum_help has been using pskb_expand_head for a while
now without any ill effects, I thought it would be a good idea to
remove the double pointers from it and its callers.

This is what the following patch does.  The only 'rider' bit is the
removal of an unnecessary BUG_ON in ip6_pkt_discard_out.  The preceding
assignment was only added because the following function oopsed so
there is no point in doing BUG_ON.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

Please apply the fix below, it addresses some bogus error messages
('error during NLMSG_PUT') that were printed because of a wrong
calculation of the 'len' parameter to NLMSG_PUT().
Signed-off-by: Harald Welte <laforge@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: David S. Miller <davem@davemloft.net>

Due to an old braindead decision, ebtables doesn't yet support the
wildcard '+' for matching interface names. The following patch removes
this nuissance and is backwards compatible.
Signed-off-by: David S. Miller <davem@davemloft.net>

Jeff already mistakenly sent in a user of this macro, so we should
probably add the macro itself too.
Signed-off-by: Hanna Linder <hannal@us.ibm.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

net_rx_softirq can preempt the calling process while incrementing the stats.
I think that we can fix this moving both CONNTRACK_STAT_INC to the locked
section. 
Signed-off-by: Pablo Neira Ayuso <pablo@eurodev.net>
Signed-off-by: Patrick McHardy <kaber@trash.net>

Signed-off-by: Yasuyuki KOZAKAI <yasuyuki.kozakai@toshiba.co.jp>
Signed-off-by: Patrick McHardy <kaber@trash.net>

Signed-off-by: Yasuyuki KOZAKAI <yasuyuki.kozakai@toshiba.co.jp>
Signed-off-by: Patrick McHardy <kaber@trash.net>

This patch fixes the following bugs in ip6t_hbh.c.
  - The cast of the pointer to the next IPv6 extension header is wrong.
  - hdrlen may underflow.
  - (u16)*optdesc causes to alignment problem.
  - The calculation of the offset to next option is wrong. In the case
    that the type isn't 0, it should be "Opt Data Len" field + 2
    (see RFC2460).
Signed-off-by: Yasuyuki KOZAKAI <yasuyuki.kozakai@toshiba.co.jp>
Signed-off-by: Patrick McHardy <kaber@trash.net>

This patch fixes the following bugs in ip6t_dst.c.

  - ".me = THIS_MODULE" is missing 
  - The cast of the pointer to the next IPv6 extension header is wrong.
  - hdrlen may underflow.
  - (u16)*optdesc causes to alignment problem.
  - The calculation of the offset to next option is wrong. In the case
    that the type isn't 0, it should be "Opt Data Len" field + 2
    (see RFC2460).
Signed-off-by: Yasuyuki KOZAKAI <yasuyuki.kozakai@toshiba.co.jp>
Signed-off-by: Patrick McHardy <kaber@trash.net>

The stop_self thing is accessed unconditionally from pSeries_setup.c

This will get rid of the stack recursion possibility that can occur if
an IRQ happens to hit the IRQ return path right after we've reset
preempt_count() to 0 and are about to disable interrupts again.
Trivially fixed by just moving the preempt count update to inside the
interrupt disable.

This makes the current PREEMPT_ACTIVE method fully work for IRQ
recursions.

Avoid naming confusion concerning "pc_debug" which is widely used by drivers
be renaming the PCMCIA "driver services" variant to ds_pc_debug. The module
parameter stays the same, thanks to module_param_named().
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

into ppc970.osdl.org:/home/torvalds/v2.6/linux

into ppc970.osdl.org:/home/torvalds/v2.6/linux

into ppc970.osdl.org:/home/torvalds/v2.6/linux

into pobox.com:/garz/repo/net-drivers-2.6

into pobox.com:/garz/repo/net-drivers-2.6

into pobox.com:/garz/repo/net-drivers-2.6

into pobox.com:/garz/repo/net-drivers-2.6

Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: Patrick McHardy <kaber@trash.net>

into coreworks.de:/home/kaber/src/nf/nf-2.6