From patchwork Fri Nov 9 02:18:02 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joseph Gasparakis X-Patchwork-Id: 197910 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 E67042C00BD for ; Fri, 9 Nov 2012 13:10:53 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757414Ab2KICKd (ORCPT ); Thu, 8 Nov 2012 21:10:33 -0500 Received: from mga02.intel.com ([134.134.136.20]:36750 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756372Ab2KICKb (ORCPT ); Thu, 8 Nov 2012 21:10:31 -0500 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP; 08 Nov 2012 18:10:31 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,741,1344236400"; d="scan'208";a="217073495" Received: from morpheus.jf.intel.com ([10.23.152.239]) by orsmga001.jf.intel.com with ESMTP; 08 Nov 2012 18:10:30 -0800 From: Joseph Gasparakis To: davem@davemloft.net, shemminger@vyatta.com, chrisw@sous-sol.org Cc: Joseph Gasparakis , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Peter P Waskiewicz Jr Subject: [PATCH 2/3] vxlan: capture inner headers during encapsulation Date: Thu, 8 Nov 2012 18:18:02 -0800 Message-Id: <1352427483-4380-3-git-send-email-joseph.gasparakis@intel.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1352427483-4380-1-git-send-email-joseph.gasparakis@intel.com> References: <1352427483-4380-1-git-send-email-joseph.gasparakis@intel.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Populating the inner header pointers of skb for vxlan Signed-off-by: Joseph Gasparakis Signed-off-by: Peter P Waskiewicz Jr --- drivers/net/vxlan.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c index 030559d..14e6c8f 100644 --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c @@ -694,11 +694,23 @@ static netdev_tx_t vxlan_xmit(struct sk_buff *skb, struct net_device *dev) __be16 df = 0; __u8 tos, ttl; int err; + unsigned int offset; dst = vxlan_find_dst(vxlan, skb); if (!dst) goto drop; + offset = skb->data - skb->head; + + skb_reset_inner_mac_header(skb); + + if (skb->network_header) + skb_set_inner_network_header(skb, skb->network_header - offset); + + if (skb->transport_header) + skb_set_inner_transport_header(skb, skb->transport_header - + offset); + /* Need space for new headers (invalidates iph ptr) */ if (skb_cow_head(skb, VXLAN_HEADROOM)) goto drop;