From: Andi Kleen <ak@muc.de>

Trivial gcc-3.5 build fixes.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@redhat.com>

From: Andi Kleen <ak@muc.de>

Trivial gcc-3.5 build fixes.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@redhat.com>

From: Andi Kleen <ak@muc.de>

Trivial gcc-3.5 build fixes.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@redhat.com>

From: Andi Kleen <ak@muc.de>

Trivial gcc-3.5 build fixes.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@redhat.com>

From: Andi Kleen <ak@muc.de>

Trivial gcc-3.5 build fixes.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@redhat.com>

From: Andi Kleen <ak@muc.de>

Trivial gcc-3.5 build fixes.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@redhat.com>

From: Andi Kleen <ak@muc.de>

Trivial gcc-3.5 build fixes.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@redhat.com>

Follow up to earlier RCU patch.  Since now using RCU, need to use
deferred free.  
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@redhat.com>

Convert the bridge forwarding database over to using RCU.
This avoids a read_lock and atomic_inc/dec in the fast path
of output.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@redhat.com>

This makes bridge port status reflect both the state of the interface
from software (up/down) and the carrier.  It makes STP handle link failure
(cable breakage, etc).  The original concept comes from a 
Mark Ruijter <bridge@siennax.com> who implemented it differently.
My way is simpler and requires no polling.

Obviously, this link state detection will only work if the network card
handles the events properly.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@redhat.com>

The br_dev_xmit function was broken in two pieces (needlessly).
Put it back together.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@redhat.com>

Need to propagate MTU changes that the bridge does to it's pseudo interface
up to others. There ends up being a double call to br_min_mtu() but that's
harmless.

Cleans up the EXPORT_SYMBOLS including dev_change_flags which is used by vlan.
Shouldn't be basing exports on kernel config options like this.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@redhat.com>

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@redhat.com>

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@redhat.com>

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

Signed-off-by: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>

Signed-off-by: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>

Signed-Off-By: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>

Signed-off-by: Masahide Nakmura <nakam@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@redhat.com>

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

Signed-off-by: Tommi Virtanen <tv@tv.debian.net>
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@redhat.com>

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

Rtnetlink has some macro's that are relics from earlier locking.
They are only used a couple of places so are easy to kill.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@redhat.com>

This qdisc code has several inline functions for locking that is only
used when adding/deleting queuing disciplines; so make them functions
instead.  The new qdisc_lock_tree encapsulates the locking used throughout
this code.

Also qdisc_run() is only called from net/core/dev.c so it should be
defined there.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@redhat.com>

Re: [AH6] Disable mutable bits after AH header

Unfortunately I broke ah6_input() in that patch.  Thanks to Miyazawa-san
for notifying me of the problem.

In that patch I removed the nh_offset parameter to ipv6_clear_mutable_options.
That broke ah6_input() because it relies on that variable to set the nexthdr.

The following patch fixes this by moving this work out to the caller
xfrm6_rcv() where the information is already available.  It also removes
an unnecessary call to ip6_find_1stfragopt() in xfrm6_rcv() since nhoffp
already points to the nexthdr preceding the current header.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@redhat.com>

Signed-off-by: Adrian Bunk <bunk@fs.tum.de>
Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@redhat.com>

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

Signed-off-by: Con Kolivas <kernel@kolivas.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@redhat.com>

Use msleep() instead of schedule_timeout() to guarantee the task
delays at least the desired time amount.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

The message "Timeout, retransmitting 1 pkts" is not an error and so
change this into a debug message.
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

This fixes several small but serious x86-64 bugs in 2.6.8rc2:

 - Fix array overflow in PCI bus checking (Travis Betak) 
 - Fix broken pci_map_sg in swiotlb (Suresh B. Siddha)
 - Remove bogus bus check in IOMMU code
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

* prism54_get/set_debug_oid are missing checks for a null pointer.
  Reported in Bugzilla number 100.

* In the card initialization routine, we try to set the
  output power. For firmware < 1.0.4.3, this leads to a
  worrying "mgt_commit has failed .." in the log although
  the device continues to react normally.
  Fix is simple, do not try to configure output power.
  (which I believe we should not be doing anyway as it is
   probably against local country regulations)

* Reintroduce pushing 0 into the TRDY_TIMEOUT and RETRY_TIMEOUT
  registers. Make this configurable with module parameter
  init_pcitm.

* We now have the ludicrous situation that some hardware setups
  require this (not even pushing 0xFF helps), whilst others
  don't care either way (the majority), and yet others bork
  if anything is pushed into these regs.
  If anybody can explain this (including Conexant :-) ), my ears
  are open.

* oid_mgt.c is calling islpci_mgt_transaction passing the address
  of a pointer to the management frame. This is not being
  initialized by the caller. The callee only updates this
  pointer when successful. When not, boom.

* Being ultracautious again, not only initialize in the caller,
  also null out the pointer unconditionally in the callee.

into tiger.hpl.hp.com:/data1/bk/lia64/to-linus-2.5