From Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Do it in addrconf_ifdown.  This fixes OOPSes on shutdown
with 2.6.10
Signed-off-by: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

The path for loopback is:
LOCAL_OUT: conntrack defrags
POST_ROUTING: conntrack refrags
PRE_ROUTING: skip conntrack defrag because skb->nfct != NULL
PRE_ROUTING: NAT gets hit by fragments

Always defrag on loopback if NAT is compiled in.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Acked-by: Rusty Russel <rusty@rustcorp.com.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

Various routines were putting a full struct tcp_sock on
the local stack.  What they really wanted was a subset
of this information when doing TCP options processing
when we only have a mini-socket (for example in SYN-RECVD
and TIME_WAIT states).

Therefore pull out the needed information into a sub-struct
and use that in the TCP options processing routines.
Signed-off-by: Arnaldo Carvalho de Melo <acme@conectiva.com.br>
Signed-off-by: David S. Miller <davem@davemloft.net>

Trying to build latest BK-kernel with !CONFIG_PCI and with CONFIG_ISAPNP=y
and CONFIG_PNPBIOS=y I got the following build error:

  LD    vmlinux
drivers/built-in.o(.text+0x5486): In function
'pnpbios_parse_allocated_irqresource':
: undefined reference to 'pcibios_penalize_isa_irq'

Clearly pcibios_penalize_isa_irq() is meant to be called only with
CONFIG_PCI=y.
Signed-off-by: Mika Kukkonen <mikukkon@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

The paca holds a shadow of the context struct, used for the real mode SLB
handler.  When we open up a new segment we have to sync up the paca copy
otherwise we will instantiate small page SLB entries until the next context
switch (at which point we resync the paca copy).
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Greg's tree changes the order of fields in struct reasource, causing x86_64 to
explode nastily.  Fix.

Cc: Greg KH <greg@kroah.com>
Cc: Andi Kleen <ak@muc.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Fix io_remap_page_range() call to pass a missing arg.
Signed-off-by: Randy Dunlap <rddunlap@osdl.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

We need asm/irq.h for __irq_itoa() on sparc[64].
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Some patch in -mm causes the sparc64 build to explode because `struct rusage'
isn't defined or declared in compat.h.   So forward-declare it.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Use named initialisers.

Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Used named initialisers in this declaration before Greg's tree's struct
resource layout changes come in and break it.

(Probably "dma page reg" shouldn't have spaces in the name - be friendly to
/proc/ioports parsers?)

Cc: Richard Henderson <rth@twiddle.net>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

The BIC TCP cwnd problem as identified by Yee-Ting Li and Doug Leith
is that the computation is recalc_ssthresh is incorrect and
BICTCP_1_OVER_BETA/2 should be BICTCP_1_OVER_BETA*2.

My fix is to implement the code from BIC TCP 1.1 which uses a sysctl
to set the beta.  There are a few variable name changes from the 1.1
code, and made the scaling factor a #define instead of hardcoded.

I validated this using netem and kprobes, for more details see
http://developer.osdl.org/shemminger/bic-beta-patch.pdfSigned-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

Fixes double-kfree that caused slab corruption.
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

ppc32's implementation of ptep_test_and_clear_young() has a logic error
which makes it fail to flush the hash table. Thus PAGE_ACCESSED is
almost never set again after beeing cleared (unless something else cause
that hash entry to be flushed).
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This is a minor modification to the previous patch submission that does
not assume the default contents of the DSPCFG register are zero.

When used with Revision D of the DP83815, the "Recommended Registers
Configuration" from page 78 of the DP83815 data sheet is not entirely
compatible with the driver's "short cable patch".  When the DSPCFG
register is written with the value suggested in the document, then
do_cable_magic() can't read the DSP coefficient and determines that all
cables attached to the DP83815D are 'short', regardless of actual
length.  Short cables (< 30m) cause do_cable_magic to enable additional
attenuation to reduce CRC and idle errors.  If the extra attenuation is
unintentionally enabled for long cables (> 50m?), they will not operate
properly.  The National Semiconductor driver, 'dp83815.c' from
http://www.national.com/appinfo/networks/files/linux_2_4.tar.gz was used
as a basis for this modification.
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

Attached is the patch to address the incorrect programming of
individual multicast address into the NIC.
Signed-off-by: Ravinandan Arakali <ravinandan.arakali@neterion.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

Someone added a new dev_set_mac_address() to netdevice.h
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

This makes for better messages on what is going on. It also
allows us (if we want to), to pick the PCI starting address
somewhere else in the gap. That may be a good idea (ie do a

	pci_mem_start = (gapstart + (gapsize >> 3) + 0xfffff) & ~0xfffff;

or similar.

We really don't care about anything beyond the 4GB mark,
so make the tests for that explicit (and add a comment),
and use regular "unsigned long" for the gap information.

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

Fix the use of CONFIG_MACH_VR1000, which was missing an
trailing zero from the configuration variable, so never
being shown if only the VR1000 was selected
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Small patch to fix following warning with CONFIG_IDE && !CONFIG_PCI:

  CC	drivers/ide/ide.o
drivers/ide/ide.c: In function 'ide_system_bus_speed':
drivers/ide/ide.c:338: warning: unused variable 'pci_default'

I decided to save some bytes by #ifdef:ing the struct in question.
CC:ing Hanna because she did the change (and just to say hi ;-).
Signed-off-by: Mika Kukkonen <mikukkon@gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Don't use the VM numbers (max_low_pfn and friends), since they depend
on the partial kernel linear mapping and only partially on the actual
physical memory layout.

Higher bits (16-23) of the address were ignored.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

A check for the PM_CAP version was recently added but i breaks devices
with version 1.  if they're in power-save mode they never get out of it.

Change it to also support v1. 
Signed-off-by: Daniel Ritz <daniel.ritz@gmx.ch>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

A conflict between X and radeonfb can cause system memory corruption
when switching console from X (note that this is not realted to the
recent radeonfb patches, the problem has been there forever as far as I
can tell).

This patch works around it in radeonfb by making sure the "offsets"
register that driver the memory mapping of the accel engine are always
properly set before every accel op. A better fix should be done in fbcon
ultimately.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

/project/m32r-linux/kernel/linux-2.6.11-rc4-bk4/b/include/linux/nodemask.h: In function `__first_unset_node':
/project/m32r-linux/kernel/linux-2.6.11-rc4-bk4/b/include/linux/nodemask.h:246: warning: passing arg 1 of `find_next_zero_bit' discards qualifiers from pointer target type
Signed-off-by: Hirokazu Takata <takata@linux-m32r.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

ratelimit the disk I/O error reporting in end_buffer_async_read().
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Greg's tree changes the layout of struct resource, so mca.c blows up.
Preemptively fix it.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

For the new Microsoft Wireless Transceiver for Bluetooth 2.0 it is
necessary to send the HCI_Reset on every device initialization.
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

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

The DMA mmap code was ignoring vm_pgoff which prevented a partial
mmap() of a DMA buffer.
Signed-off-by: Russell King <rmk@arm.linux.org.uk>

Patch from Lennert Buytenhek

Fix a misspelled config symbol name in the ixp2000 code.

Signed-off-by: Lennert Buytenhek
Signed-off-by: Russell King

Patch from Lennert Buytenhek

This is an old patch from 2.6.9-rc3-ds2 that never made it upstream.
The IXP2000 slowport has two modes of operation, 8-bit and 32-bit.
The slowport itself is a byte-wide bus, and in 8-bit mode, it does the
more-or-less obvious thing: every word read causes four byte reads,
and those bytes are then combined into a word according to the xscale
core's current endian setting.  So, what value you get depends on what
endianity your IXP2000 is running in.
In 32-bit mode, however, it is the slowport itself which combines
bytes into words, and for this it unconditionally uses little endian
mode.  In this mode, word reads from the slowport will return the
same value no matter whether the xscale core is running in big or
little endian mode.  This can be a plus in some cases.  Byte (and
halfword) accesses in 32-bit mode have rather useless semantics
due to this, though.
The usefulness of 32-bit mode is limited to the initial boot.  When
the IXP2000 resets, the slowport is always in 32-bit mode, so if you
flash the bootloader into flash (which is connected to the slowport)
using little-endian byte ordering, the xscale will always read the
instruction stream correctly, no matter whether it's running in big
or little endian mode.
After booting it makes no sense to use 32-bit mode anymore.  Especially
since the slowport's word ordering in 32-bit mode is little endian,
and the IXP2000 is conventionally run in big endian, which gives all
kinds of fun issues when trying to access peripherals connected to
the slowport.
In fact, the current MTD map driver for IXP2000 already sets the
slowport to 8-bit mode because it cannot access the flash otherwise.
However, this means that if the MTD map driver is not compiled in for
some reason, the slowport will stay in 32-bit mode after the initial
boot, which will cause peripheral accesses to unexpectedly break!

Signed-off-by: Lennert Buytenhek
Signed-off-by: Russell King

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

Anything larger than MAX_INT is suspect.  Do this
for user copies too.
Signed-off-by: David S. Miller <davem@davemloft.net>

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

Patch from Lennert Buytenhek

- The PCI2050B bridge is not wired to any interrupt pin.
- The SPI-3 option board slot is wired to PCI_B.
- Don't printk every time enp2611_map_pci_irq is called.
- Complain loudly if we encounter an unknown device.

Signed-off-by: Lennert Buytenhek
Signed-off-by: Russell King