lkml.org 
[lkml]   [2012]   [Aug]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[patch net-next v2 03/15] vlan: add link to upper device
    Date
    Signed-off-by: Jiri Pirko <jiri@resnulli.us>
    ---
    net/8021q/vlan.c | 10 +++++++++-
    1 file changed, 9 insertions(+), 1 deletion(-)

    diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
    index 9096bcb..2dca0fa 100644
    --- a/net/8021q/vlan.c
    +++ b/net/8021q/vlan.c
    @@ -105,6 +105,8 @@ void unregister_vlan_dev(struct net_device *dev, struct list_head *head)
    */
    unregister_netdevice_queue(dev, head);

    + netdev_upper_dev_unlink(real_dev, dev);
    +
    if (grp->nr_vlan_devs == 0)
    vlan_gvrp_uninit_applicant(real_dev);

    @@ -162,9 +164,13 @@ int register_vlan_dev(struct net_device *dev)
    if (err < 0)
    goto out_uninit_applicant;

    + err = netdev_upper_dev_link(real_dev, dev);
    + if (err)
    + goto out_uninit_applicant;
    +
    err = register_netdevice(dev);
    if (err < 0)
    - goto out_uninit_applicant;
    + goto out_upper_dev_unlink;

    /* Account for reference in struct vlan_dev_priv */
    dev_hold(real_dev);
    @@ -180,6 +186,8 @@ int register_vlan_dev(struct net_device *dev)

    return 0;

    +out_upper_dev_unlink:
    + netdev_upper_dev_unlink(real_dev, dev);
    out_uninit_applicant:
    if (grp->nr_vlan_devs == 0)
    vlan_gvrp_uninit_applicant(real_dev);
    --
    1.7.10.4


    \
     
     \ /
      Last update: 2012-08-14 17:43    [W:4.140 / U:0.244 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site