| Message ID | 1467274002-61390-23-git-send-email-pshelar@ovn.org |
|---|---|
| State | Superseded |
| Headers | show |
On Thu, Jun 30, 2016 at 1:06 AM, Pravin B Shelar <pshelar@ovn.org> wrote: > Upstream Commit: > commit 41009481b690493c169ce85f591b9d32c6fd9422 > Author: Nicolas Dichtel <nicolas.dichtel@6wind.com> > > ovs/geneve: fix rtnl notifications on iface deletion > > The function geneve_dev_create_fb() (only used by ovs) never calls > rtnl_configure_link(). The consequence is that dev->rtnl_link_state is > never set to RTNL_LINK_INITIALIZED. > During the deletion phase, the function rollback_registered_many() sends > a RTM_DELLINK only if dev->rtnl_link_state is set to RTNL_LINK_INITIALIZED. > > Fixes: e305ac6cf5a1 ("geneve: Add support to collect tunnel metadata.") > CC: Pravin B Shelar <pshelar@ovn.org> > CC: Jesse Gross <jesse@ovn.org> > CC: Thomas Graf <tgraf@suug.ch> > Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> > Signed-off-by: David S. Miller <davem@davemloft.net> > > Signed-off-by: Pravin B Shelar <pshelar@ovn.org> Acked-by: Jesse Gross <jesse@kernel.org>
diff --git a/datapath/linux/compat/geneve.c b/datapath/linux/compat/geneve.c index 2e0d3aa..46ec92b 100644 --- a/datapath/linux/compat/geneve.c +++ b/datapath/linux/compat/geneve.c @@ -1610,6 +1610,10 @@ struct net_device *rpl_geneve_dev_create_fb(struct net *net, const char *name, if (err) goto err; + err = rtnl_configure_link(dev, NULL); + if (err < 0) + goto err; + return dev; err:
Upstream Commit: commit 41009481b690493c169ce85f591b9d32c6fd9422 Author: Nicolas Dichtel <nicolas.dichtel@6wind.com> ovs/geneve: fix rtnl notifications on iface deletion The function geneve_dev_create_fb() (only used by ovs) never calls rtnl_configure_link(). The consequence is that dev->rtnl_link_state is never set to RTNL_LINK_INITIALIZED. During the deletion phase, the function rollback_registered_many() sends a RTM_DELLINK only if dev->rtnl_link_state is set to RTNL_LINK_INITIALIZED. Fixes: e305ac6cf5a1 ("geneve: Add support to collect tunnel metadata.") CC: Pravin B Shelar <pshelar@ovn.org> CC: Jesse Gross <jesse@ovn.org> CC: Thomas Graf <tgraf@suug.ch> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Pravin B Shelar <pshelar@ovn.org> --- datapath/linux/compat/geneve.c | 4 ++++ 1 file changed, 4 insertions(+)