Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@davemloft.net>

ESP needs to check for error returns from calls
to crypto_cipher_setkey().
Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

It should be unsigned long.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

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

Some misc. fixes for 5750. The first 2 fixes below are for correctness.

- Do not set extended MAC addresses for 5750
- Do not set NIC ring addresses in send ring and receive return ring
  RCBs for 5750
- Check eeprom write protect bit for 5750
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

This patch removes an annoying problem in xfrm_user.  As it is every
time an SA is added it probes every known algorithm in the universe.
Now if they all existed it would be OK.  However, for the ones which
don't actually exist this causes multiple /sbin/modprobe processes to
be spawned which slows the system down when you're adding hundreds of
SAs.

Since we know the type of algorithm required when we're adding a new
SA, we can get away with only probing the selected algorithms.  This
is what the following patch does for xfrm_user.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: James Morris <jmorris@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

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

But as stated in bonding.txt, the ARP monitor requires the underlying
driver to update dev->trans_start and dev->last_rx.

The patch below adds the required functionality to the TUN/TAP driver.
Please test if this helps in your case.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

From: Matt Mackall <mpm@selenic.com>

This avoids a nasty NAPI race by checking that work was actually scheduled
for the CPU netpoll is running on and pulls the NAPI-specific code out into
a separate function.

Original idea from Jeff Moyer
Tested by Andrew Tridgell
Signed-off-by: Matt Mackall <mpm@selenic.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

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

Andreas Schwab <schwab@suse.de> points out that the ipt_conntrack
match exposes struct

Ian Kumlien reported that new NAT code started sending out DCC
requests with 0 as the IP address.  That prompted me to write a simple
IRC test case, which both illustrated the bug, and found another one
in that the wrong expectation was being set up when NAT occurred.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Randy Dunlap <rddunlap@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

Should add this to rev1 of multiport before 2.6.11 comes out.
Signed-off-by: Phil Oester <kernel@linuxace.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>

Here's another patch to fix compile-errors, this time with NAT but
without modules. There's a missing 'extern' in ip_conntrack_tftp.h
Signed-off-by: Martin Josefsson <gandalf@wlug.westbo.se>
Signed-off-by: Patrick McHardy <kaber@trash.net>

This patch fixes some compile errors with NAT that has appeared
after all the recent patches.

Move struct ip_conntrack_expect after the definition of struct
ip_conntrack. Add #ifdef CONFIG_IP_NF_NAT_NEEDED around
ip_nat_initialized() Add lockhelp.h to ipt_CLUSTERIP.c
Signed-off-by: Martin Josefsson <gandalf@wlug.westbo.se>
Signed-off-by: Patrick McHardy <kaber@trash.net>

This patch fixes two size checks in the checkentry() for SNAT and DNAT
targets. The patch to remove support for multiple ranges forgot to use
IPT_ALIGN(). This isn't a problem on x86 but other archs like parisc
are affected and thus can't add any SNAT/DNAT rules.
Signed-off-by: Martin Josefsson <gandalf@wlug.westbo.se>
Signed-off-by: Patrick McHardy <kaber@trash.net>

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

- Fix TSO for 5750 chips by setting tcp checksum field to 0 for TSO packets
- Add TG3_FLG2_HW_TSO flag for 5750 and newer chips that use the same TSO
  scheme
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

If we forward a fragmented packet, we can have ip_summed
set to CHECKSUM_HW or similar.  This is fine for local
protocol processing, but once if we are forwarding this
packet we want to reset ip_summed to CHECKSUM_NONE.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

This patch adds the support for RFCOMM service level security. It
allows to request authentication and encryption before a RFCOMM
connection is finally established.
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

The fix for socket unlink race introduced a deadlock in the RFCOMM
code. The state change function is always called under the DLC lock
and if rfcomm_sock_kill() is called the rfcomm_sock_destruct() will
dead lock. So the DLC lock must be dropped first and claimed again
afterwards.
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

This patch fixes the problem of keys repeating when too many keys
are pressed at the same time (e.g. when typing quickly). This
often results in "mount" becoming "mouount".

It seems that Bluetooth keyboards send a HID report with the keys
all set to 0x01 if too many keys were pressed at the same time.
This confuses the previous report handling logic and now these
reports are ignored.
Signed-off-by: Juha Yrjölä <juha.yrjola@iki.fi>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

Use wait_event_timeout() instead of custom wait queue code. The
current code uses TASK_INTERRUPTIBLE but only cares about timing
out and the wait queue event taking place (does not actively do
anything in response to signals), so wait_event_timeout() should
be enough.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

Use wait_event_interruptible_timeout() instead of custom wait
queue code.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Anton Blanchard wrote:
>Your recent patch looks to break module kallsyms lookups....
>It looks like if CONFIG_KALLSYMS_ALL is set then we never look up module
>addresses.

Separate lookups for kernel and modules when CONFIG_KALLSYMS_ALL=y.
Signed-off-by: Keith Owens <kaos@ocs.com.au>
Acked-by: Chris Wedgwood <cw@f00f.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Fix warning:

In file included from include/asm/numa.h:5,
                 from arch/x86_64/kernel/setup64.c:27:
include/asm/numnodes.h:6:1: warning: "NODES_SHIFT" redefined
In file included from include/linux/mmzone.h:13,
                 from include/linux/gfp.h:4,
                 from include/linux/slab.h:15,
                 from include/linux/percpu.h:4,
                 from include/linux/sched.h:33,
                 from arch/x86_64/kernel/setup64.c:11:
include/linux/numa.h:11:1: warning: this is the location of the previous definition

in UP builds.
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

From Terence Ripperda <tripperda@nvidia.com>

When doing iounmap don't try to change_page_attr back the guard
page that ioremap added.

Since the last round of change_page_attr changes this would
trigger an BUG because the reference count on the changed pages
wouldn't match up.

The problem would be only visible on machines with >3GB of memory,
because only then the PCI memory hole is below end_pfn and
change_page_attr is used.

Fixed for both i386 and x86-64.

This was actually discovered&fixed by Andrea earlier, but I goofed up
while doing the last ioremap fixes merge and this change got lost.
Poor Terence had to debug it again. Sorry about that.

cc: andrea@suse.de
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Undo bogus change that was introduced with kprobes.  It's not
really needed and it breaks some user applications because
it changes the signal for int 3 from SIGTRAP to SIGSEGV.

Cc: <prasanna@in.ibm.com>
Signed-off-by: Andi Kleen <ak@suse.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

- If dst/src are equal, memcpy can be used.
- Eliminate register writes which were unused
Signed-off-by: David S. Miller <davem@davemloft.net>