On Thu, Dec 8, 2016 at 9:39 AM, Mahesh Bandewar (महेश बंडेवार)
<mahe...@google.com> wrote:
> On Wed, Dec 7, 2016 at 5:21 PM, <f...@ikuai8.com> wrote:
>> From: Gao Feng <f...@ikuai8.com>
>>
>> When netdev_upper_dev_unlink failed in ipvlan_link_new, need to
>> unlink the ipvlan dev with upper dev.
>>
>> Signed-off-by: Gao Feng <f...@ikuai8.com>
>> ---
>> drivers/net/ipvlan/ipvlan_main.c | 4 +++-
>> 1 file changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/net/ipvlan/ipvlan_main.c
>> b/drivers/net/ipvlan/ipvlan_main.c
>> index 0fef178..189adbc 100644
>> --- a/drivers/net/ipvlan/ipvlan_main.c
>> +++ b/drivers/net/ipvlan/ipvlan_main.c
>> @@ -546,13 +546,15 @@ static int ipvlan_link_new(struct net *src_net, struct
>> net_device *dev,
>> }
>> err = ipvlan_set_port_mode(port, mode);
>> if (err) {
>> - goto unregister_netdev;
>> + goto dev_unlink;
>> }
>>
>> list_add_tail_rcu(&ipvlan->pnode, &port->ipvlans);
>> netif_stacked_transfer_operstate(phy_dev, dev);
>> return 0;
>>
>> +dev_unlink:
> probably 'unlink_netdev' label inline with other labels used. thanks
OK, it is better name.
I will follow it and send v2 update.
Regards
Feng
>> + netdev_upper_dev_unlink(phy_dev, dev);
>> unregister_netdev:
>> unregister_netdevice(dev);
>> destroy_ipvlan_port:
>> --
>> 1.9.1
>>
>>
