Merge branch 'master' of /repos/git/net-next-2.6

Conflicts:
	net/bridge/br_device.c
	net/bridge/br_forward.c

Signed-off-by: Patrick McHardy <kaber@trash.net>

diff --cc include/linux/ipv6.h
Simple merge

diff --cc net/bridge/br_device.c
index 007bde87415d1ead4b6b1ffc1aa14c6be67a714e,074c59690fc56e803d625af57629275fefb65889..f15f9c4a0dd2d17719c58d18ce66b4a2b763503b
--- 1/net/bridge/br_device.c
--- 2/net/bridge/br_device.c
+++ b/net/bridge/br_device.c
@@@ -13,9 -13,11 +13,12 @@@
  
  #include <linux/kernel.h>
  #include <linux/netdevice.h>
+ #include <linux/netpoll.h>
  #include <linux/etherdevice.h>
  #include <linux/ethtool.h>
+ #include <linux/list.h>
 +#include <linux/netfilter_bridge.h>
+ 
  #include <asm/uaccess.h>
  #include "br_private.h"
  

diff --cc net/bridge/br_forward.c
index 92fb3293a21576e8ffa9b6f6f950af2d870e984e,92ad9feb199d3dcef5d88edbe75201b3e2369f13..a98ef13930979a129a8d0195e5a94dee3ec7bd2a
--- 1/net/bridge/br_forward.c
--- 2/net/bridge/br_forward.c
+++ b/net/bridge/br_forward.c
@@@ -66,9 -73,23 +73,23 @@@ int br_forward_finish(struct sk_buff *s
  
  static void __br_deliver(const struct net_bridge_port *to, struct sk_buff *skb)
  {
+ #ifdef CONFIG_NET_POLL_CONTROLLER
+       struct net_bridge *br = to->br;
+       if (unlikely(br->dev->priv_flags & IFF_IN_NETPOLL)) {
+               struct netpoll *np;
+               to->dev->npinfo = skb->dev->npinfo;
+               np = skb->dev->npinfo->netpoll;
+               np->real_dev = np->dev = to->dev;
+               to->dev->priv_flags |= IFF_IN_NETPOLL;
+       }
+ #endif
        skb->dev = to->dev;
 -      NF_HOOK(PF_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev,
 -                      br_forward_finish);
 +      NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev,
 +              br_forward_finish);
+ #ifdef CONFIG_NET_POLL_CONTROLLER
+       if (skb->dev->npinfo)
+               skb->dev->npinfo->netpoll->dev = br->dev;
+ #endif
  }
  
  static void __br_forward(const struct net_bridge_port *to, struct sk_buff *skb)

diff --cc net/bridge/br_multicast.c
Simple merge

diff --cc net/ipv4/ip_output.c
Simple merge

diff --cc net/ipv4/ipmr.c
Simple merge

diff --cc net/ipv4/raw.c
Simple merge

diff --cc net/ipv6/ip6_output.c
Simple merge

diff --cc net/ipv6/mcast.c
Simple merge

diff --cc net/ipv6/raw.c
Simple merge