4 files changed, 10 insertions, 5 deletions

diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index f35c1a378d..aff6a779c9 100644
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -108,6 +108,7 @@ static void port_carrier_check(struct work_struct *work)
                 spin_unlock_bh(&br->lock);
         }
 done:
+        dev_put(dev);
         rtnl_unlock();
 }
 
@@ -161,7 +162,8 @@ static void del_nbp(struct net_bridge_port *p)
 
         dev_set_promiscuity(dev, -1);
 
-        cancel_delayed_work(&p->carrier_check);
+        if (cancel_delayed_work(&p->carrier_check))
+                dev_put(dev);
 
         spin_lock_bh(&br->lock);
         br_stp_disable_port(p);
@@ -444,7 +446,9 @@ int br_add_if(struct net_bridge *br, struct net_device *dev)
         spin_lock_bh(&br->lock);
         br_stp_recalculate_bridge_id(br);
         br_features_recompute(br);
-        schedule_delayed_work(&p->carrier_check, BR_PORT_DEBOUNCE);
+        if (schedule_delayed_work(&p->carrier_check, BR_PORT_DEBOUNCE))
+                dev_hold(dev);
+
         spin_unlock_bh(&br->lock);
 
         dev_set_mtu(br->dev, br_min_mtu(br));
diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c
index a0744e653f..7712d76f06 100644
--- a/net/bridge/br_netfilter.c
+++ b/net/bridge/br_netfilter.c
@@ -957,7 +957,7 @@ int __init br_netfilter_init(void)
         if (ret < 0)
                 return ret;
 #ifdef CONFIG_SYSCTL
-        brnf_sysctl_header = register_sysctl_table(brnf_net_table, 0);
+        brnf_sysctl_header = register_sysctl_table(brnf_net_table);
         if (brnf_sysctl_header == NULL) {
                 printk(KERN_WARNING
                        "br_netfilter: can't register to sysctl.\n");
diff --git a/net/bridge/br_notify.c b/net/bridge/br_notify.c
index 8cd3e42290..3311c4e308 100644
--- a/net/bridge/br_notify.c
+++ b/net/bridge/br_notify.c
@@ -56,7 +56,9 @@ static int br_device_event(struct notifier_block *unused, unsigned long event, v
 
         case NETDEV_CHANGE:
                 if (br->dev->flags & IFF_UP)
-                        schedule_delayed_work(&p->carrier_check, BR_PORT_DEBOUNCE);
+                        if (schedule_delayed_work(&p->carrier_check,
+                                                BR_PORT_DEBOUNCE))
+                                dev_hold(dev);
                 break;
 
         case NETDEV_FEAT_CHANGE:
diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
index 5818d70b8e..34c49799f9 100644
--- a/net/bridge/netfilter/ebtables.c
+++ b/net/bridge/netfilter/ebtables.c
@@ -16,7 +16,6 @@
  */
 
 /* used for print_string */
-#include <linux/sched.h>
 #include <linux/tty.h>
 
 #include <linux/kmod.h>