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

Conflicts:
	include/net/netfilter/xt_rateest.h
	net/bridge/br_netfilter.c
	net/netfilter/nf_conntrack_core.c

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

1 files changed, 8 insertions, 0 deletions

diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index 18b245e2c00e..d9242342837e 100644
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -147,6 +147,7 @@ static void del_nbp(struct net_bridge_port *p)
 
         list_del_rcu(&p->list);
 
+        netdev_rx_handler_unregister(dev);
         rcu_assign_pointer(dev->br_port, NULL);
 
         br_multicast_del_port(p);
@@ -429,6 +430,11 @@ int br_add_if(struct net_bridge *br, struct net_device *dev)
                 goto err2;
 
         rcu_assign_pointer(dev->br_port, p);
+
+        err = netdev_rx_handler_register(dev, br_handle_frame);
+        if (err)
+                goto err3;
+
         dev_disable_lro(dev);
 
         list_add_rcu(&p->list, &br->port_list);
@@ -451,6 +457,8 @@ int br_add_if(struct net_bridge *br, struct net_device *dev)
         br_netpoll_enable(br, dev);
 
         return 0;
+err3:
+        rcu_assign_pointer(dev->br_port, NULL);
 err2:
         br_fdb_delete_by_port(br, p, 1);
 err1: