How to use gretap with bridge?
Subsystems (4)
A message that is not in the archive (sent off-list or not yet received): [email protected]
A message that is not in the archive (sent off-list or not yet received): [email protected]
I've been able to reproduce this with a upstream kernel (2.6.32-rc5) - symptom appears to be specific to the IP addresses specified on the ip command, but not in any clear way. I assume that remote should be the ip of the host at the remote end of the tunnel, and local should be an IP address of a real interface on the this machine?
Am I missing something obvious here? At the time of the below commands, br0 exists, but has no members, and eth0 is configured and up with ip 131.151.0.36/255.255.254.0. All other interfaces are down.
[root@bridge-rol ~]# ip link add gre3 type gretap remote 131.151.35.35 local 131.151.0.36
[root@bridge-rol ~]# brctl addif br0 gre3
can't add gre3 to bridge br0: Invalid argument
[root@bridge-rol ~]# ip link del gre3
[root@bridge-rol ~]# ip link add gre3 type gretap remote 131.151.35.35 local 131.151.0.35
[root@bridge-rol ~]# brctl addif br0 gre3
can't add gre3 to bridge br0: Invalid argument
[root@bridge-rol ~]# ip link del gre3
[root@bridge-rol ~]# ip link add gre3 type gretap remote 131.151.35.35 local 10.151.0.35
[root@bridge-rol ~]# brctl addif br0 gre3
[root@bridge-rol ~]# ip link del gre3
[root@bridge-rol ~]# ip link add gre3 type gretap remote 131.151.35.35 local 131.1.1.1
[root@bridge-rol ~]# brctl addif br0 gre3
can't add gre3 to bridge br0: Invalid argument
-- Nathan
------------------------------------------------------------
Nathan Neulinger [email protected] Missouri S&T Information Technology (573) 612-1412 System Administrator - Principal KD0DMH
Quoted 30 lines
-----Original Message-----
From: Herbert Xu [mailto:[email protected]]
Sent: Thursday, October 29, 2009 12:07 PM
To: Neulinger, Nathan
Subject: Re: How to use gretap with bridge?Quoted 8 lines · Nathan
Is there some trick I'm missing to adding a gretap interface to a bridge?
ip link add gre1 type gretap remote 131.151.0.36 local 131.151.0.35 ip link set gre1 up
brctl addbr br0
brctl addif br0 gre1Quoted 4 lines
This results in an Invalid argument error when issuing the addif. Testing with latest fc12 2.6.31.5-96 kernel.
Any suggestions?
I can't reproduce this here. Can you please try the latest upstream kernel? If it still does the same thing, please post to [email protected].
Thanks!
--
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <[email protected]> Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Further testing - if the leading octet of the 'local' address is even, it allows it to be added to bridge, if it's odd, it won't.
Any ideas?
-- Nathan
------------------------------------------------------------
Nathan Neulinger [email protected] Missouri S&T Information Technology (573) 612-1412 System Administrator - Principal KD0DMH
Quoted 6 lines
-----Original Message-----
From: Neulinger, Nathan
Sent: Thursday, October 29, 2009 1:39 PM
To: '[email protected]'
Subject: RE: How to use gretap with bridge?
Quoted 7 lines
I've been able to reproduce this with a upstream kernel (2.6.32-rc5) - symptom appears to be specific to the IP addresses specified on the ip command, but not in any clear way. I assume that remote should be the ip of the host at the remote end of the tunnel, and local should be an IP address of a real interface on the this machine?
Am I missing something obvious here? At the time of the below
commands,
Quoted 27 lines
br0 exists, but has no members, and eth0 is configured and up with ip 131.151.0.36/255.255.254.0. All other interfaces are down.
[root@bridge-rol ~]# ip link add gre3 type gretap remote 131.151.35.35 local 131.151.0.36
[root@bridge-rol ~]# brctl addif br0 gre3
can't add gre3 to bridge br0: Invalid argument[root@bridge-rol ~]# ip link del gre3
[root@bridge-rol ~]# ip link add gre3 type gretap remote 131.151.35.35 local 131.151.0.35
[root@bridge-rol ~]# brctl addif br0 gre3
can't add gre3 to bridge br0: Invalid argument[root@bridge-rol ~]# ip link del gre3
[root@bridge-rol ~]# ip link add gre3 type gretap remote 131.151.35.35 local 10.151.0.35
[root@bridge-rol ~]# brctl addif br0 gre3[root@bridge-rol ~]# ip link del gre3
[root@bridge-rol ~]# ip link add gre3 type gretap remote 131.151.35.35 local 131.1.1.1
[root@bridge-rol ~]# brctl addif br0 gre3
can't add gre3 to bridge br0: Invalid argument
Quoted 19 lines
-- Nathan
------------------------------------------------------------
Nathan Neulinger [email protected] Missouri S&T Information Technology (573) 612-1412 System Administrator - Principal KD0DMHQuoted 11 lines
-----Original Message-----
From: Herbert Xu [mailto:[email protected]]
Sent: Thursday, October 29, 2009 12:07 PM
To: Neulinger, Nathan
Subject: Re: How to use gretap with bridge?Quoted 4 lines · Nathan
Is there some trick I'm missing to adding a gretap interface to a bridge?
ip link add gre1 type gretap remote 131.151.0.36 local
131.151.0.35
Quoted 19 lines
Quoted 19 lines
Quoted 8 lines
ip link set gre1 up
brctl addbr br0
brctl addif br0 gre1This results in an Invalid argument error when issuing the addif. Testing with latest fc12 2.6.31.5-96 kernel.
Any suggestions?
I can't reproduce this here. Can you please try the latest upstream kernel? If it still does the same thing, please post to [email protected].
Thanks!
--
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <[email protected]> Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Quoted 5 lines · Nathan
Further testing - if the leading octet of the 'local' address is even, it allows it to be added to bridge, if it's odd, it won't.
Any ideas?
If leading octet of MAC address is odd, then bridge thinks it is not a valid ethernet for bridging because it is a multicast address.
I was referring to the local IP in the "ip link add ... remote x.z.z.z local y.z.z.z" command specifying the endpoints of the tunnel. It lets it be added to the bridge if y is even, but not if y is odd. Why should it care what the IP of the tunnel endpoints are?
-- Nathan
------------------------------------------------------------
Nathan Neulinger [email protected] Missouri S&T Information Technology (573) 612-1412 System Administrator - Principal KD0DMH
Quoted 23 lines
-----Original Message-----
From: Stephen Hemminger [mailto:[email protected]]
Sent: Thursday, October 29, 2009 3:01 PM
To: Neulinger, Nathan
Cc: [email protected]
Subject: Re: How to use gretap with bridge?Quoted 1 line · Nathan
Further testing - if the leading octet of the 'local' address is
even,
Quoted 4 lines
it allows it to be added to bridge, if it's odd, it won't.
Any ideas?
If leading octet of MAC address is odd, then bridge thinks it is not a valid ethernet for bridging because it is a multicast address.
--
Quoted 7 lines · Nathan
I was referring to the local IP in the "ip link add ... remote x.z.z.z local y.z.z.z" command specifying the endpoints of the tunnel. It lets it be added to the bridge if y is even, but not if y is odd. Why should it care what the IP of the tunnel endpoints are?
-- Nathan
It looks like a GRE driver bug. It uses IP address for dev->dev_addr when it really should be generating a Ethernet address when using Ethernet wrapper mode.
RFC 1/1 bridge: check address size
Check the address size of underlying device because the bridge assumes the underlying device has ethernet address format. See forwarding table and STP, for places where this true.
Also, add some comments to explain errors.
net/bridge/br_if.c +6 -1
@@ -377,12 +377,17 @@ int br_add_if(struct net_bridge *br, strstruct net_bridge_port *p;int err =0 ; -if (dev->flags &IFF_LOOPBACK || dev->type !=ARPHRD_ETHER ) +/* Don't allow bridging non ethernet like devices */ +if (dev->flags &IFF_LOOPBACK + || dev->type !=ARPHRD_ETHER + || dev->addr_len !=ETH_ALEN )return -EINVAL ; +/* No bridging of bridges */ if (dev->netdev_ops->ndo_start_xmit == br_dev_xmit)return -ELOOP ; +/* Device is already being bridged */ if (dev->br_port !=NULL )return -EBUSY ;
David Miller
maintainerRe: [RFC] bridge: check address size
From: Stephen Hemminger <[email protected]>
Date: Thu, 29 Oct 2009 15:24:08 -0700
net/bridge/br_if.c int br_add_if(struct net_bridge *br, str · line 383
Quoted 5 lines
net/bridge/br_if.c +4
-1-if (dev->flags &IFF_LOOPBACK || dev->type !=ARPHRD_ETHER ) +/* Don't allow bridging non ethernet like devices */ +if (dev->flags &IFF_LOOPBACK + || dev->type !=ARPHRD_ETHER + || dev->addr_len !=ETH_ALEN )
Please format this as:
Review
Quoted 3 lines
(quoted diff) +3
-0+ if (dev->flags & IFF_LOOPBACK || + dev->type != ARPHRD_ETHER || + dev->addr_len != ETH_ALEN)
What you're doing in the patch follows the GNU coding standards, no the kernel ones. :-)
Re: [RFC] bridge: check address size
Quoted 11 lines · On Mon, 02 Nov 2009 00:07:56 -0800 (PST) David Miller <[email protected]>…
From: Stephen Hemminger <[email protected]>
Date: Thu, 29 Oct 2009 15:24:08 -0700net/bridge/br_if.c int br_add_if(struct net_bridge *br, str · line 383
Quoted 5 lines
net/bridge/br_if.c +4
-1-if (dev->flags &IFF_LOOPBACK || dev->type !=ARPHRD_ETHER ) +/* Don't allow bridging non ethernet like devices */ +if (dev->flags &IFF_LOOPBACK + || dev->type !=ARPHRD_ETHER + || dev->addr_len !=ETH_ALEN )Please format this as:
Quoted 6 lines
Review
Quoted 3 lines
(quoted diff) +3
-0+ if (dev->flags & IFF_LOOPBACK || + dev->type != ARPHRD_ETHER || + dev->addr_len != ETH_ALEN)What you're doing in the patch follows the GNU coding standards, no the kernel ones. :-)
Sure, I never saw which side to put conditionals as part of coding standard document.
PATCH 1/1 bridge: prevent bridging wrong device
In reply to David MillerThe bridge code assumes ethernet addressing, so be more strict in the what is allowed. This showed up when GRE had a bug and was not using correct address format.
Add some more comments for increased clarity.
net/bridge/br_if.c +5 -1
@@ -377,12 +377,16 @@ int br_add_if(struct net_bridge *br, strstruct net_bridge_port *p;int err =0 ; -if (dev->flags &IFF_LOOPBACK || dev->type !=ARPHRD_ETHER ) +/* Don't allow bridging non-ethernet like devices */ +if ((dev->flags &IFF_LOOPBACK ) || + dev->type !=ARPHRD_ETHER || dev->addr_len !=ETH_ALEN )return -EINVAL ; +/* No bridging of bridges */ if (dev->netdev_ops->ndo_start_xmit == br_dev_xmit)return -ELOOP ; +/* Device is already being bridged */ if (dev->br_port !=NULL )return -EBUSY ;
Re: [PATCH] bridge: prevent bridging wrong device
From: Stephen Hemminger <[email protected]>
Date: Wed, 4 Nov 2009 09:47:13 -0800
Quoted 7 lines
The bridge code assumes ethernet addressing, so be more strict in the what is allowed. This showed up when GRE had a bug and was not using correct address format.
Add some more comments for increased clarity.
Signed-off-by Stephen Hemminger <[email protected]>
Applied to net-2.6, thanks.
As a note - the bridging/tunneling is working perfectly once I force it to use a bogus IP range that starts with an even number, but unfortunately, that's not going to work so good given that our primary address space is 131.151.x.x.
Any ideas on what is up with the even/odd error?
-- Nathan
------------------------------------------------------------
Nathan Neulinger [email protected] Missouri S&T Information Technology (573) 612-1412 System Administrator - Principal KD0DMH
Quoted 10 lines
-----Original Message-----
From: Neulinger, Nathan
Sent: Thursday, October 29, 2009 3:22 PM
To: 'Stephen Hemminger'
Cc: [email protected]
Subject: RE: How to use gretap with bridge?I was referring to the local IP in the "ip link add ... remote x.z.z.z local y.z.z.z" command specifying the endpoints of the tunnel. It lets it be added to the bridge if y is even, but not if y is odd. Why
should
Quoted 33 lines
it care what the IP of the tunnel endpoints are?
-- Nathan
------------------------------------------------------------
Nathan Neulinger [email protected] Missouri S&T Information Technology (573) 612-1412 System Administrator - Principal KD0DMHQuoted 23 lines
-----Original Message-----
From: Stephen Hemminger [mailto:[email protected]]
Sent: Thursday, October 29, 2009 3:01 PM
To: Neulinger, Nathan
Cc: [email protected]
Subject: Re: How to use gretap with bridge?Quoted 1 line · Nathan
Further testing - if the leading octet of the 'local' address is
even,
Quoted 4 lines
it allows it to be added to bridge, if it's odd, it won't.
Any ideas?
If leading octet of MAC address is odd, then bridge thinks it is not a valid ethernet for bridging because it is a multicast address.
--
Now I see it - Stephen actually had it right on - the problem is that the gre tunnel is creating a MAC address on the fly based on the tunnel endpoint ip address, so if the tunnel endpoint address starts with an odd number, it hits the multicast check in the bridging code. (I'm sure that's what he meant and I just missed it entirely.)
Simplest option would probably be to just mask off the first octet with 0xFD or using the ip as the last four octets of the mac instead of the first four.
-- Nathan
------------------------------------------------------------
Nathan Neulinger [email protected] Missouri S&T Information Technology (573) 612-1412 System Administrator - Principal KD0DMH
Quoted 8 lines
-----Original Message-----
From: Neulinger, Nathan
Sent: Thursday, October 29, 2009 3:59 PM
To: 'Herbert Xu'
Cc: '[email protected]'
Subject: RE: How to use gretap with bridge?As a note - the bridging/tunneling is working perfectly once I force
it
Quoted 60 lines
to use a bogus IP range that starts with an even number, but unfortunately, that's not going to work so good given that our primary address space is 131.151.x.x.
Any ideas on what is up with the even/odd error?
-- Nathan
------------------------------------------------------------
Nathan Neulinger [email protected] Missouri S&T Information Technology (573) 612-1412 System Administrator - Principal KD0DMHQuoted 8 lines
-----Original Message-----
From: Neulinger, Nathan
Sent: Thursday, October 29, 2009 3:22 PM
To: 'Stephen Hemminger'
Cc: [email protected]
Subject: RE: How to use gretap with bridge?I was referring to the local IP in the "ip link add ... remote
x.z.z.z
Quoted 1 line
local y.z.z.z" command specifying the endpoints of the tunnel. It
lets
Quoted 1 line
it be added to the bridge if y is even, but not if y is odd. Why
should
Quoted 33 lines
it care what the IP of the tunnel endpoints are?
-- Nathan
------------------------------------------------------------
Nathan Neulinger [email protected] Missouri S&T Information Technology (573) 612-1412 System Administrator - Principal KD0DMHQuoted 23 lines
-----Original Message-----
From: Stephen Hemminger [mailto:[email protected]]
Sent: Thursday, October 29, 2009 3:01 PM
To: Neulinger, Nathan
Cc: [email protected]
Subject: Re: How to use gretap with bridge?Quoted 1 line · Nathan
Further testing - if the leading octet of the 'local' address is
even,
Quoted 4 lines
it allows it to be added to bridge, if it's odd, it won't.
Any ideas?
If leading octet of MAC address is odd, then bridge thinks it is not a valid ethernet for bridging because it is a multicast address.
--
Quoted 9 lines · Nathan
Now I see it - Stephen actually had it right on - the problem is that the gre tunnel is creating a MAC address on the fly based on the tunnel endpoint ip address, so if the tunnel endpoint address starts with an odd number, it hits the multicast check in the bridging code. (I'm sure that's what he meant and I just missed it entirely.)
Simplest option would probably be to just mask off the first octet with
0xFDor using the ip as the last four octets of the mac instead of the first four.
This looks like a bug in either iproute or the kernel. It's not supposed to set a MAC address unless the user specifically gives one. If one is not given the kernel will generate a valid MAC address.
Cheers,
Signature · 4 lines
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txtActually, it looks like it's broke here in ipgre_tunnel_init:
ipv4/ip_gre.c 2009-10-29 18:45:13.069697015 -0500 renamed from ipv4/ip_gre.c.orig 2009-10-29 18:45:29.335723326 -0500 +2 -1
@@ -1240,7 +1240,8 @@ tunnel->dev = dev; strcpy(tunnel->parms.name, dev->name); - memcpy(dev->dev_addr, &tunnel->parms.iph.saddr, 4); + /* assign random mac addr on init */ + random_ether_addr(dev->dev_addr); memcpy(dev->broadcast, &tunnel->parms.iph.daddr, 4); if (iph->daddr) {
The above change fixes it for me, but I'm no expert on this chunk of code. (Perhaps it it shouldn't set dev_addr at all?)
-- Nathan
------------------------------------------------------------
Nathan Neulinger [email protected] Missouri S&T Information Technology (573) 612-1412 System Administrator - Principal KD0DMH
Quoted 9 lines
-----Original Message-----
From: Herbert Xu [mailto:[email protected]]
Sent: Thursday, October 29, 2009 6:48 PM
To: Neulinger, Nathan
Cc: Stephen Hemminger; [email protected]
Subject: Re: How to use gretap with bridge?Quoted 1 line · Nathan
Now I see it - Stephen actually had it right on - the problem is
that
Quoted 3 lines
Quoted 1 line
the gre tunnel is creating a MAC address on the fly based on the
tunnel
Quoted 1 line
endpoint ip address, so if the tunnel endpoint address starts with
an
Quoted 21 lines
Quoted 1 line
odd number, it hits the multicast check in the bridging code. (I'm
sure
Quoted 3 lines
that's what he meant and I just missed it entirely.)
Simplest option would probably be to just mask off the first octet
with
Quoted 1 line
0xFDor using the ip as the last four octets of the mac instead ofthe
Quoted 1 line
first four.
This looks like a bug in either iproute or the kernel. It's not supposed to set a MAC address unless the user specifically gives one. If one is not given the kernel will generate a valid MAC address.
Cheers,
--
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <[email protected]> Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Quoted 3 lines · Nathan
The above change fixes it for me, but I'm no expert on this chunk of code. (Perhaps it it shouldn't set
dev_addrat all?)
OK, it was a stupid mistake on my part. I added a netdev ops struct for tap but didn't actually use it! Please let us know whether this patch fixes the problem.
gre: Fix dev_addr clobbering for gretap
Nathan Neulinger noticed that gretap devices get their MAC address from the local IP address, which results in invalid MAC addresses half of the time.
This is because gretap is still using the tunnel netdev ops rather than the correct tap netdev ops struct.
This patch also fixes changelink to not clobber the MAC address for the gretap case.
Thanks,
Signature · 5 lines
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
--net/ipv4/ip_gre.c +16 -12
@@ -1464,7 +1464,7 @@ static void ipgre_tap_setup(struct net_device *dev)ether_setup (dev); - dev->netdev_ops = &ipgre_netdev_ops; + dev->netdev_ops = &ipgre_tap_netdev_ops; dev->destructor = free_netdev; dev->iflink =0 ;
@@ -1525,25 +1525,29 @@ static int ipgre_changelink(struct net_device *dev, struct nlattr *tb[],if (t->dev != dev)return -EEXIST ; }else { -unsigned nflags =0 ; - t = nt; -if (ipv4_is_multicast (p.iph.daddr)) - nflags =IFF_BROADCAST ; -else if (p.iph.daddr) - nflags =IFF_POINTOPOINT ; +if (dev->type !=ARPHRD_ETHER ) { +unsigned nflags =0 ; -if ((dev->flags ^ nflags) & - (IFF_POINTOPOINT |IFF_BROADCAST )) -return -EINVAL ; +if (ipv4_is_multicast (p.iph.daddr)) + nflags =IFF_BROADCAST ; +else if (p.iph.daddr) + nflags =IFF_POINTOPOINT ; + +if ((dev->flags ^ nflags) & + (IFF_POINTOPOINT |IFF_BROADCAST )) +return -EINVAL ; + }ipgre_tunnel_unlink (ign, t); t->parms.iph.saddr = p.iph.saddr; t->parms.iph.daddr = p.iph.daddr; t->parms.i_key = p.i_key; -memcpy (dev->dev_addr, &p.iph.saddr,4 ); -memcpy (dev->broadcast, &p.iph.daddr,4 ); +if (dev->type !=ARPHRD_ETHER ) { +memcpy (dev->dev_addr, &p.iph.saddr,4 ); +memcpy (dev->broadcast, &p.iph.daddr,4 ); + }ipgre_tunnel_link (ign, t);netdev_state_change (dev); }
Stephen Hemminger
Acked-byQuoted 18 lines · On Fri, 30 Oct 2009 11:51:48 -0400 Herbert Xu <[email protected]>…
Quoted 3 lines · Nathan
The above change fixes it for me, but I'm no expert on this chunk of code. (Perhaps it it shouldn't set
dev_addrat all?)OK, it was a stupid mistake on my part. I added a netdev ops struct for tap but didn't actually use it! Please let us know whether this patch fixes the problem.
gre: Fix
dev_addrclobbering for gretapNathan Neulinger noticed that gretap devices get their MAC address from the local IP address, which results in invalid MAC addresses half of the time.
This is because gretap is still using the tunnel netdev ops rather than the correct tap netdev ops struct.
Quoted 6 lines
This patch also fixes changelink to not clobber the MAC address for the gretap case.
Signed-off-by Herbert Xu <[email protected]>Thanks,
From: Stephen Hemminger <[email protected]>
Date: Fri, 30 Oct 2009 09:39:57 -0700
Quoted 12 lines
Quoted 9 lines · On Fri, 30 Oct 2009 11:51:48 -0400 Herbert Xu <[email protected]>…
gre: Fix
dev_addrclobbering for gretapNathan Neulinger noticed that gretap devices get their MAC address from the local IP address, which results in invalid MAC addresses half of the time.
This is because gretap is still using the tunnel netdev ops rather than the correct tap netdev ops struct.
Quoted 8 lines
Quoted 6 lines
This patch also fixes changelink to not clobber the MAC address for the gretap case.
Signed-off-by Herbert Xu <[email protected]>Thanks,
Applied to net-2.6, thanks!
Confirmed, this fixes the problem for me and even now allows changing the mac access by request.
Now I'm on to figuring out MTU issues. Thanks!
-- Nathan
------------------------------------------------------------
Nathan Neulinger [email protected] Missouri S&T Information Technology (573) 612-1412 System Administrator - Principal KD0DMH
Quoted 93 lines
-----Original Message-----
From: Herbert Xu [mailto:[email protected]]
Sent: Friday, October 30, 2009 10:52 AM
To: Neulinger, Nathan; David S. Miller
Cc: [email protected]; [email protected]
Subject: Re: How to use gretap with bridge?Quoted 3 lines · Nathan
The above change fixes it for me, but I'm no expert on this chunk of code. (Perhaps it it shouldn't set
dev_addrat all?)OK, it was a stupid mistake on my part. I added a netdev ops struct for tap but didn't actually use it! Please let us know whether this patch fixes the problem.
gre: Fix
dev_addrclobbering for gretapNathan Neulinger noticed that gretap devices get their MAC address from the local IP address, which results in invalid MAC addresses half of the time.
This is because gretap is still using the tunnel netdev ops rather than the correct tap netdev ops struct.
This patch also fixes changelink to not clobber the MAC address for the gretap case.
Signed-off-by Herbert Xu <[email protected]>Thanks,
--
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <[email protected]> Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
--net/ipv4/ip_gre.c +1
-1@@ -1464,7 +1464,7 @@ static void ipgre_tap_setup(struct net_device *dev)ether_setup (dev); - dev->netdev_ops = &ipgre_netdev_ops; + dev->netdev_ops = &ipgre_tap_netdev_ops; dev->destructor = free_netdev;net/ipv4/ip_gre.c +15
-11dev->iflink =0 ;@@ -1525,25 +1525,29 @@ static int ipgre_changelink(struct net_device *dev, struct nlattr *tb[], if (t->dev != dev) return -EEXIST; }else { -unsigned nflags =0 ; - t = nt; -if (ipv4_is_multicast (p.iph.daddr)) - nflags =IFF_BROADCAST ; -else if (p.iph.daddr) - nflags =IFF_POINTOPOINT ; +if (dev->type !=ARPHRD_ETHER ) { +unsigned nflags =0 ; -if ((dev->flags ^ nflags) & - (IFF_POINTOPOINT |IFF_BROADCAST )) -return -EINVAL ; +if (ipv4_is_multicast (p.iph.daddr)) + nflags =IFF_BROADCAST ; +else if (p.iph.daddr) + nflags =IFF_POINTOPOINT ; + +if ((dev->flags ^ nflags) & + (IFF_POINTOPOINT |IFF_BROADCAST )) +return -EINVAL ; + }ipgre_tunnel_unlink (ign, t); t->parms.iph.saddr = p.iph.saddr; t->parms.iph.daddr = p.iph.daddr; t->parms.i_key = p.i_key; -memcpy (dev->dev_addr, &p.iph.saddr,4 ); -memcpy (dev->broadcast, &p.iph.daddr,4 ); +if (dev->type !=ARPHRD_ETHER ) { +memcpy (dev->dev_addr, &p.iph.saddr,4 ); +memcpy (dev->broadcast, &p.iph.daddr,4 ); + }ipgre_tunnel_link (ign, t);netdev_state_change (dev);}