Re: iproute2 and regressing "ipv6: convert tunnels to net_device_ops"

Re: iproute2 and regressing "ipv6: convert tunnels to net_device_ops"

[Jan Engelhardt]

(Cc'ed netdev ml)

On Monday 2009-03-09 14:14, Rafael J. Wysocki wrote:

>Hi,
>
>On Monday 09 March 2009, Jan Engelhardt wrote:
>> Hi,
>> 
>> 
>> commit 1326c3d5a4b792a2b15877feb7fb691f8945d203 
>> (v2.6.28-rc6-461-g23a12b1) broke the display of local and remote 
>> addresses of an SIT tunnel in iproute2. Instead of the addresses 
>> assigned, it only displays 0.0.0.0. The version of iproute2 is 2.6.25, 
>> as shipped with openSUSE 11.1.
>> 
>> Before:
>> # ip t a sit7 mode sit remote 1.2.3.4 local 5.6.7.8
>> # ip a
>> 7: sit7@NONE: <POINTOPOINT,NOARP> mtu 1480 qdisc noop stat DOWN
>>     link/sit 5.6.7.8 peer 1.2.3.4
>> 
>> After:
>> 7: sit7@NONE: <POINTOPOINT,NOARP> mtu 1480 qdisc noop stat DOWN
>>     link/sit 0.0.0.0 brd 0.0.0.0
>> 
>> ---->
>> commit 23a12b14715e2dcd34dc8002927263ad3437344c
>> Author: Stephen Hemminger <shemminger@vyatta.com>
>> Date:   Thu Nov 20 20:33:56 2008 -0800
>> 
>>     ipv6: convert tunnels to net_device_ops
>>     
>>     Like IPV4, convert the tunnel virtual devices to use net_device_ops.
>>     
>>     Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
>>     Signed-off-by: David S. Miller <davem@davemloft.net>
>> 
>> :040000 040000 23483d156e517904d31dd7e2276a0ff8a25f2ecc 
>> 395574b3a80869307a5e936a02598476f7e1c49b M      net
>> <----
>
>If you want me to track this, please send a copy to a mailing list with
>archives to which I can link or file a bugzilla report (with CC to me).

Re: iproute2 and regressing "ipv6: convert tunnels to net_device_ops"

[Rafael J. Wysocki]

On Monday 09 March 2009, Jan Engelhardt wrote:
> 
> (Cc'ed netdev ml)

Tracked as http://bugzilla.kernel.org/show_bug.cgi?id=12868 .

> On Monday 2009-03-09 14:14, Rafael J. Wysocki wrote:
> 
> >Hi,
> >
> >On Monday 09 March 2009, Jan Engelhardt wrote:
> >> Hi,
> >> 
> >> 
> >> commit 1326c3d5a4b792a2b15877feb7fb691f8945d203 
> >> (v2.6.28-rc6-461-g23a12b1) broke the display of local and remote 
> >> addresses of an SIT tunnel in iproute2. Instead of the addresses 
> >> assigned, it only displays 0.0.0.0. The version of iproute2 is 2.6.25, 
> >> as shipped with openSUSE 11.1.
> >> 
> >> Before:
> >> # ip t a sit7 mode sit remote 1.2.3.4 local 5.6.7.8
> >> # ip a
> >> 7: sit7@NONE: <POINTOPOINT,NOARP> mtu 1480 qdisc noop stat DOWN
> >>     link/sit 5.6.7.8 peer 1.2.3.4
> >> 
> >> After:
> >> 7: sit7@NONE: <POINTOPOINT,NOARP> mtu 1480 qdisc noop stat DOWN
> >>     link/sit 0.0.0.0 brd 0.0.0.0
> >> 
> >> ---->
> >> commit 23a12b14715e2dcd34dc8002927263ad3437344c
> >> Author: Stephen Hemminger <shemminger@vyatta.com>
> >> Date:   Thu Nov 20 20:33:56 2008 -0800
> >> 
> >>     ipv6: convert tunnels to net_device_ops
> >>     
> >>     Like IPV4, convert the tunnel virtual devices to use net_device_ops.
> >>     
> >>     Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
> >>     Signed-off-by: David S. Miller <davem@davemloft.net>
> >> 
> >> :040000 040000 23483d156e517904d31dd7e2276a0ff8a25f2ecc 
> >> 395574b3a80869307a5e936a02598476f7e1c49b M      net
> >> <----
> >
> >If you want me to track this, please send a copy to a mailing list with
> >archives to which I can link or file a bugzilla report (with CC to me).

Thanks,
Rafael

[PATCH] ipv6: fix display of local and remote sit endpoints

[Bjørn Mork]

ipv6: fix display of local and remote sit endpoints

This fixes the regressions cause by
commit 1326c3d5a4b792a2b15877feb7fb691f8945d203
(v2.6.28-rc6-461-g23a12b1) broke the display of local and remote
addresses of an SIT tunnel in iproute2.

nt->parms is used by ipip6_tunnel_init() and therefore need to be
initialized first.

Tracked as http://bugzilla.kernel.org/show_bug.cgi?id=12868

Reported-by: Jan Engelhardt <jengelh@medozas.de>
Signed-off-by: Bjørn Mork <bjorn@mork.no>
---
 net/ipv6/sit.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
index d3467e5..5cee2bc 100644
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@ -188,9 +188,9 @@ static struct ip_tunnel * ipip6_tunnel_locate(struct net *net,
 	}
 
 	nt = netdev_priv(dev);
-	ipip6_tunnel_init(dev);
 
 	nt->parms = *parms;
+	ipip6_tunnel_init(dev);
 
 	if (parms->i_flags & SIT_ISATAP)
 		dev->priv_flags |= IFF_ISATAP;
-- 
1.5.6.5

Re: [PATCH] ipv6: fix display of local and remote sit endpoints

[David Miller]

From: Bjørn Mork <bjorn@mork.no>
Date: Mon, 16 Mar 2009 14:47:24 +0100

> ipv6: fix display of local and remote sit endpoints
> 
> This fixes the regressions cause by
> commit 1326c3d5a4b792a2b15877feb7fb691f8945d203
> (v2.6.28-rc6-461-g23a12b1) broke the display of local and remote
> addresses of an SIT tunnel in iproute2.
> 
> nt->parms is used by ipip6_tunnel_init() and therefore need to be
> initialized first.
> 
> Tracked as http://bugzilla.kernel.org/show_bug.cgi?id=12868
> 
> Reported-by: Jan Engelhardt <jengelh@medozas.de>
> Signed-off-by: Bjørn Mork <bjorn@mork.no>

Applied, thanks.