From 03e436372c77d3c3f5e543251e73bcd47cf11027 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Wed, 25 Mar 2009 21:01:47 -0700 Subject: [PATCH] --- yaml --- r: 135560 b: refs/heads/master c: cda6d377ec6b2ee2e58d563d0bd7eb313e0165df h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/bridge/br_if.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a942fc60dd6e..cd06cb399100 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c80dd2da736ba235c2ca5dcaa00aac6907786c5b +refs/heads/master: cda6d377ec6b2ee2e58d563d0bd7eb313e0165df diff --git a/trunk/net/bridge/br_if.c b/trunk/net/bridge/br_if.c index 727c5c510a60..8a96672e2c5c 100644 --- a/trunk/net/bridge/br_if.c +++ b/trunk/net/bridge/br_if.c @@ -426,7 +426,6 @@ int br_add_if(struct net_bridge *br, struct net_device *dev) err1: kobject_del(&p->kobj); err0: - kobject_put(&p->kobj); dev_set_promiscuity(dev, -1); put_back: dev_put(dev);