From patchwork Wed Oct 10 06:35:48 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: stephen hemminger X-Patchwork-Id: 190557 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.180.67]) by ozlabs.org (Postfix) with ESMTP id 8E0AD2C0087 for ; Wed, 10 Oct 2012 17:39:28 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752974Ab2JJGjY (ORCPT ); Wed, 10 Oct 2012 02:39:24 -0400 Received: from fiji.vyatta.com ([76.74.103.50]:52280 "EHLO fiji.vyatta.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751148Ab2JJGjX (ORCPT ); Wed, 10 Oct 2012 02:39:23 -0400 Received: by fiji.vyatta.com (Postfix, from userid 1051) id 0AF321540F7; Tue, 9 Oct 2012 22:27:06 -0700 (PDT) Message-Id: <20121010063623.533119759@vyatta.com> User-Agent: quilt/0.60-1 Date: Tue, 09 Oct 2012 23:35:48 -0700 From: Stephen Hemminger To: davem@davemloft.net Cc: netdev@vger.kernel.org Subject: [PATCHv2 3/8] vxlan: use ip_route_output References: <20121010063545.453368147@vyatta.com> Content-Disposition: inline; filename=vxlan-route-output.patch Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Select source address for VXLAN packet based on route destination and don't lie to route code. VXLAN is not GRE. Signed-off-by: Stephen Hemminger --- v2 - zero flow structure -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- a/drivers/net/vxlan.c 2012-10-09 18:08:32.630456072 -0700 +++ b/drivers/net/vxlan.c 2012-10-09 18:08:33.466447793 -0700 @@ -680,9 +680,13 @@ static netdev_tx_t vxlan_xmit(struct sk_ hash = skb_get_rxhash(skb); - rt = ip_route_output_gre(dev_net(dev), &fl4, dst, - vxlan->saddr, vxlan->vni, - RT_TOS(tos), vxlan->link); + memset(&fl4, 0, sizeof(fl4)); + fl4.flowi4_oif = vxlan->link; + fl4.flowi4_tos = RT_TOS(tos); + fl4.daddr = dst; + fl4.saddr = vxlan->saddr; + + rt = ip_route_output_key(dev_net(dev), &fl4); if (IS_ERR(rt)) { netdev_dbg(dev, "no route to %pI4\n", &dst); dev->stats.tx_carrier_errors++; @@ -724,7 +728,7 @@ static netdev_tx_t vxlan_xmit(struct sk_ iph->frag_off = df; iph->protocol = IPPROTO_UDP; iph->tos = vxlan_ecn_encap(tos, old_iph, skb); - iph->daddr = fl4.daddr; + iph->daddr = dst; iph->saddr = fl4.saddr; iph->ttl = ttl ? : ip4_dst_hoplimit(&rt->dst);