From patchwork Wed Jul 13 05:23:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pravin Shelar X-Patchwork-Id: 647707 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (archives.nicira.com [96.126.127.54]) by ozlabs.org (Postfix) with ESMTP id 3rq6hj47JGz9ssP for ; Wed, 13 Jul 2016 15:24:37 +1000 (AEST) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id 3427910987; Tue, 12 Jul 2016 22:24:31 -0700 (PDT) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx3v3.cudamail.com (mx3.cudamail.com [64.34.241.5]) by archives.nicira.com (Postfix) with ESMTPS id 228AA10935 for ; Tue, 12 Jul 2016 22:24:30 -0700 (PDT) Received: from bar6.cudamail.com (localhost [127.0.0.1]) by mx3v3.cudamail.com (Postfix) with ESMTPS id 65C72162C8A for ; Tue, 12 Jul 2016 23:24:29 -0600 (MDT) X-ASG-Debug-ID: 1468387468-0b32370ec401a10001-byXFYA Received: from mx3-pf3.cudamail.com ([192.168.14.3]) by bar6.cudamail.com with ESMTP id Awpxps7fnaJjImfq (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Tue, 12 Jul 2016 23:24:28 -0600 (MDT) X-Barracuda-Envelope-From: pshelar@ovn.org X-Barracuda-RBL-Trusted-Forwarder: 192.168.14.3 Received: from unknown (HELO relay5-d.mail.gandi.net) (217.70.183.197) by mx3-pf3.cudamail.com with ESMTPS (DHE-RSA-AES256-SHA encrypted); 13 Jul 2016 05:24:28 -0000 Received-SPF: pass (mx3-pf3.cudamail.com: SPF record at ovn.org designates 217.70.183.197 as permitted sender) X-Barracuda-Apparent-Source-IP: 217.70.183.197 X-Barracuda-RBL-IP: 217.70.183.197 Received: from mfilter43-d.gandi.net (mfilter43-d.gandi.net [217.70.178.174]) by relay5-d.mail.gandi.net (Postfix) with ESMTP id 011B941C07F; Wed, 13 Jul 2016 07:24:26 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mfilter43-d.gandi.net Received: from relay5-d.mail.gandi.net ([IPv6:::ffff:217.70.183.197]) by mfilter43-d.gandi.net (mfilter43-d.gandi.net [::ffff:10.0.15.180]) (amavisd-new, port 10024) with ESMTP id KdbCklFaeArD; Wed, 13 Jul 2016 07:24:24 +0200 (CEST) X-Originating-IP: 24.130.10.65 Received: from localhost.localdomain.localdomain (c-24-130-10-65.hsd1.ca.comcast.net [24.130.10.65]) (Authenticated sender: pshelar@ovn.org) by relay5-d.mail.gandi.net (Postfix) with ESMTPSA id EA84541C084; Wed, 13 Jul 2016 07:24:23 +0200 (CEST) X-CudaMail-Envelope-Sender: pshelar@ovn.org From: Pravin B Shelar To: dev@openvswitch.org X-CudaMail-Whitelist-To: dev@openvswitch.org X-CudaMail-MID: CM-V3-711064305 X-CudaMail-DTE: 071216 X-CudaMail-Originating-IP: 217.70.183.197 Date: Tue, 12 Jul 2016 22:23:52 -0700 X-ASG-Orig-Subj: [##CM-V3-711064305##][PATCH 01/24] datapath: compat: clear skb IPCB block. Message-Id: <1468387441-61781-1-git-send-email-pshelar@ovn.org> X-Mailer: git-send-email 1.8.3.1 X-Barracuda-Connect: UNKNOWN[192.168.14.3] X-Barracuda-Start-Time: 1468387468 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://web.cudamail.com:443/cgi-mod/mark.cgi X-ASG-Whitelist: Header =?UTF-8?B?eFwtY3VkYW1haWxcLXdoaXRlbGlzdFwtdG8=?= X-Virus-Scanned: by bsmtpd at cudamail.com X-Barracuda-BRTS-Status: 1 Subject: [ovs-dev] [PATCH 01/24] datapath: compat: clear skb IPCB block. X-BeenThere: dev@openvswitch.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dev-bounces@openvswitch.org Sender: "dev" OVS compat ip_local_out/ip6_local_out clear out skb IPCB, we also need to do it for non compat version. Signed-off-by: Pravin B Shelar Acked-by: Jesse Gross --- datapath/linux/compat/gso.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/datapath/linux/compat/gso.h b/datapath/linux/compat/gso.h index 0969d4d..280fc96 100644 --- a/datapath/linux/compat/gso.h +++ b/datapath/linux/compat/gso.h @@ -96,6 +96,22 @@ static inline int skb_inner_mac_offset(const struct sk_buff *skb) #define ip6_local_out rpl_ip6_local_out int rpl_ip6_local_out(struct sk_buff *skb); +#else + +static inline int rpl_ip_local_out(struct sk_buff *skb) +{ + memset(IPCB(skb), 0, sizeof(*IPCB(skb))); + return ip_local_out(skb); +} +#define ip_local_out rpl_ip_local_out + +static inline int rpl_ip6_local_out(struct sk_buff *skb) +{ + memset(IP6CB(skb), 0, sizeof (*IP6CB(skb))); + return ip6_local_out(skb); +} +#define ip6_local_out rpl_ip6_local_out + #endif /* 3.18 */ #ifndef USE_UPSTREAM_TUNNEL