lkml.org 
[lkml]   [2008]   [Jan]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH 136/196] Kobject: convert net/bridge/br_if.c to use kobject_init/add_ng()
    On Thu, 24 Jan 2008 23:32:45 -0800
    Greg Kroah-Hartman <gregkh@suse.de> wrote:

    > This converts the code to use the new kobject functions, cleaning up the
    > logic in doing so.
    >
    > Cc: Stephen Hemminger <shemminger@linux-foundation.org>
    > Cc: Kay Sievers <kay.sievers@vrfy.org>
    > Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    > ---
    > net/bridge/br_if.c | 10 +++-------
    > 1 files changed, 3 insertions(+), 7 deletions(-)
    >
    > diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
    > index dadec94..298e0f4 100644
    > --- a/net/bridge/br_if.c
    > +++ b/net/bridge/br_if.c
    > @@ -258,12 +258,6 @@ static struct net_bridge_port *new_nbp(struct net_bridge *br,
    > p->state = BR_STATE_DISABLED;
    > br_stp_port_timer_init(p);
    >
    > - kobject_init(&p->kobj);
    > - kobject_set_name(&p->kobj, SYSFS_BRIDGE_PORT_ATTR);
    > - p->kobj.ktype = &brport_ktype;
    > - p->kobj.parent = &(dev->dev.kobj);
    > - p->kobj.kset = NULL;
    > -
    > return p;
    > }
    >
    > @@ -379,7 +373,8 @@ int br_add_if(struct net_bridge *br, struct net_device *dev)
    > if (IS_ERR(p))
    > return PTR_ERR(p);
    >
    > - err = kobject_add(&p->kobj);
    > + err = kobject_init_and_add(&p->kobj, &brport_ktype, &(dev->dev.kobj),
    > + SYSFS_BRIDGE_PORT_ATTR);
    > if (err)
    > goto err0;
    >
    > @@ -416,6 +411,7 @@ err2:
    > br_fdb_delete_by_port(br, p, 1);
    > err1:
    > kobject_del(&p->kobj);
    > + return err;
    > err0:
    > kobject_put(&p->kobj);
    > return err;

    This is fine, no issues.

    --
    Stephen Hemminger <stephen.hemminger@vyatta.com>


    \
     
     \ /
      Last update: 2008-01-25 17:23    [W:5.073 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site