From patchwork Fri Oct 30 15:51:48 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herbert Xu X-Patchwork-Id: 37311 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 8E289B7C3A for ; Sat, 31 Oct 2009 02:52:03 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932482AbZJ3Pvw (ORCPT ); Fri, 30 Oct 2009 11:51:52 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932469AbZJ3Pvw (ORCPT ); Fri, 30 Oct 2009 11:51:52 -0400 Received: from rhun.apana.org.au ([64.62.148.172]:33435 "EHLO arnor.apana.org.au" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932467AbZJ3Pvv (ORCPT ); Fri, 30 Oct 2009 11:51:51 -0400 Received: from gondolin.me.apana.org.au ([192.168.0.6]) by arnor.apana.org.au with esmtp (Exim 4.63 #1 (Debian)) id 1N3tlX-0006hr-Cu; Sat, 31 Oct 2009 02:51:51 +1100 Received: from herbert by gondolin.me.apana.org.au with local (Exim 4.69) (envelope-from ) id 1N3tlU-0002A9-K7; Fri, 30 Oct 2009 11:51:48 -0400 Date: Fri, 30 Oct 2009 11:51:48 -0400 From: Herbert Xu To: "Neulinger, Nathan" , "David S. Miller" Cc: shemminger@vyatta.com, netdev@vger.kernel.org Subject: Re: How to use gretap with bridge? Message-ID: <20091030155148.GA8283@gondor.apana.org.au> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <846C5B546E47494CBBD796CA8CA1617EA3B43C@MST-VMAIL1.srv.mst.edu> Organization: Core X-Newsgroups: apana.lists.os.linux.netdev User-Agent: Mutt/1.5.18 (2008-05-17) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Neulinger, Nathan wrote: > > 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?) 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. Signed-off-by: Herbert Xu Thanks, Acked-by: Stephen Hemminger diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index 41ada99..1433338 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c @@ -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); }