[ovs-dev,1/2] Datapath: Cleanup compat ip6_tunnel.c

Message ID 20180709130918.18760-1-aserdean@ovn.org
State New
Headers show
Series
  • [ovs-dev,1/2] Datapath: Cleanup compat ip6_tunnel.c
Related show

Commit Message

Alin Gabriel Serdean July 9, 2018, 1:09 p.m.
Remove double assignment of `ip6_tnl *t`.

Signed-off-by: Alin Gabriel Serdean <aserdean@ovn.org>
---
 datapath/linux/compat/ip6_tunnel.c | 2 --
 1 file changed, 2 deletions(-)

Comments

Yifeng Sun July 9, 2018, 6:03 p.m. | #1
Good catch, thanks.

Reviewed-by: Yifeng Sun <pkusunyifeng@gmail.com>

On Mon, Jul 9, 2018 at 6:09 AM, Alin Gabriel Serdean <aserdean@ovn.org>
wrote:

> Remove double assignment of `ip6_tnl *t`.
>
> Signed-off-by: Alin Gabriel Serdean <aserdean@ovn.org>
> ---
>  datapath/linux/compat/ip6_tunnel.c | 2 --
>  1 file changed, 2 deletions(-)
>
> diff --git a/datapath/linux/compat/ip6_tunnel.c
> b/datapath/linux/compat/ip6_tunnel.c
> index 7c6678796..ecec971e2 100644
> --- a/datapath/linux/compat/ip6_tunnel.c
> +++ b/datapath/linux/compat/ip6_tunnel.c
> @@ -316,8 +316,6 @@ static int ip6_tnl_create2(struct net_device *dev)
>         struct ip6_tnl_net *ip6n = net_generic(net, ip6_tnl_net_id);
>         int err;
>
> -       t = netdev_priv(dev);
> -
>         dev->rtnl_link_ops = &ip6_link_ops;
>         err = register_netdevice(dev);
>         if (err < 0)
> --
> 2.16.1.windows.1
>
> _______________________________________________
> dev mailing list
> dev@openvswitch.org
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
>
Ben Pfaff July 9, 2018, 6:32 p.m. | #2
Acked-by: Ben Pfaff <blp@ovn.org>

On Mon, Jul 09, 2018 at 11:03:10AM -0700, Yifeng Sun wrote:
> Good catch, thanks.
> 
> Reviewed-by: Yifeng Sun <pkusunyifeng@gmail.com>
> 
> On Mon, Jul 9, 2018 at 6:09 AM, Alin Gabriel Serdean <aserdean@ovn.org>
> wrote:
> 
> > Remove double assignment of `ip6_tnl *t`.
> >
> > Signed-off-by: Alin Gabriel Serdean <aserdean@ovn.org>
> > ---
> >  datapath/linux/compat/ip6_tunnel.c | 2 --
> >  1 file changed, 2 deletions(-)
> >
> > diff --git a/datapath/linux/compat/ip6_tunnel.c
> > b/datapath/linux/compat/ip6_tunnel.c
> > index 7c6678796..ecec971e2 100644
> > --- a/datapath/linux/compat/ip6_tunnel.c
> > +++ b/datapath/linux/compat/ip6_tunnel.c
> > @@ -316,8 +316,6 @@ static int ip6_tnl_create2(struct net_device *dev)
> >         struct ip6_tnl_net *ip6n = net_generic(net, ip6_tnl_net_id);
> >         int err;
> >
> > -       t = netdev_priv(dev);
> > -
> >         dev->rtnl_link_ops = &ip6_link_ops;
> >         err = register_netdevice(dev);
> >         if (err < 0)
> > --
> > 2.16.1.windows.1
> >
> > _______________________________________________
> > dev mailing list
> > dev@openvswitch.org
> > https://mail.openvswitch.org/mailman/listinfo/ovs-dev
> >
> _______________________________________________
> dev mailing list
> dev@openvswitch.org
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev

Patch

diff --git a/datapath/linux/compat/ip6_tunnel.c b/datapath/linux/compat/ip6_tunnel.c
index 7c6678796..ecec971e2 100644
--- a/datapath/linux/compat/ip6_tunnel.c
+++ b/datapath/linux/compat/ip6_tunnel.c
@@ -316,8 +316,6 @@  static int ip6_tnl_create2(struct net_device *dev)
 	struct ip6_tnl_net *ip6n = net_generic(net, ip6_tnl_net_id);
 	int err;
 
-	t = netdev_priv(dev);
-
 	dev->rtnl_link_ops = &ip6_link_ops;
 	err = register_netdevice(dev);
 	if (err < 0)