lkml.org 
[lkml]   [2016]   [Apr]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 36/78] ip6_tunnel: set rtnl_link_ops before calling register_netdevice
    Date
    From: Thadeu Lima de Souza Cascardo <cascardo@redhat.com>

    3.12-stable review patch. If anyone has any objections, please let me know.

    ===============

    [ Upstream commit b6ee376cb0b7fb4e7e07d6cd248bd40436fb9ba6 ]

    When creating an ip6tnl tunnel with ip tunnel, rtnl_link_ops is not set
    before ip6_tnl_create2 is called. When register_netdevice is called, there
    is no linkinfo attribute in the NEWLINK message because of that.

    Setting rtnl_link_ops before calling register_netdevice fixes that.

    Fixes: 0b112457229d ("ip6tnl: add support of link creation via rtnl")
    Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@redhat.com>
    Acked-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    ---
    net/ipv6/ip6_tunnel.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
    index 8883795462fe..cfdb663e0259 100644
    --- a/net/ipv6/ip6_tunnel.c
    +++ b/net/ipv6/ip6_tunnel.c
    @@ -267,12 +267,12 @@ static int ip6_tnl_create2(struct net_device *dev)

    t = netdev_priv(dev);

    + dev->rtnl_link_ops = &ip6_link_ops;
    err = register_netdevice(dev);
    if (err < 0)
    goto out;

    strcpy(t->parms.name, dev->name);
    - dev->rtnl_link_ops = &ip6_link_ops;

    dev_hold(dev);
    ip6_tnl_link(ip6n, t);
    --
    2.8.1
    \
     
     \ /
      Last update: 2016-04-22 13:41    [W:6.252 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site