From patchwork Tue Nov 10 16:18:20 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pravin B Shelar X-Patchwork-Id: 542515 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (li376-54.members.linode.com [96.126.127.54]) by ozlabs.org (Postfix) with ESMTP id E2A88141415 for ; Wed, 11 Nov 2015 03:18:32 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=nicira_com.20150623.gappssmtp.com header.i=@nicira_com.20150623.gappssmtp.com header.b=2T7jj6n+; dkim-atps=neutral Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id 43E4910683; Tue, 10 Nov 2015 08:18:31 -0800 (PST) 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 93C5A1067F for ; Tue, 10 Nov 2015 08:18:30 -0800 (PST) Received: from bar3.cudamail.com (localhost [127.0.0.1]) by mx3v3.cudamail.com (Postfix) with ESMTPS id BD8DB163177 for ; Tue, 10 Nov 2015 09:18:29 -0700 (MST) X-ASG-Debug-ID: 1447172309-03dd7b34061a860001-byXFYA Received: from mx3-pf2.cudamail.com ([192.168.14.1]) by bar3.cudamail.com with ESMTP id IsMzdkpKxcijfbSu (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Tue, 10 Nov 2015 09:18:29 -0700 (MST) X-Barracuda-Envelope-From: pshelar@nicira.com X-Barracuda-RBL-Trusted-Forwarder: 192.168.14.1 Received: from unknown (HELO mail-pa0-f49.google.com) (209.85.220.49) by mx3-pf2.cudamail.com with ESMTPS (RC4-SHA encrypted); 10 Nov 2015 16:18:29 -0000 Received-SPF: unknown (mx3-pf2.cudamail.com: Multiple SPF records returned) X-Barracuda-RBL-Trusted-Forwarder: 209.85.220.49 Received: by pabfh17 with SMTP id fh17so1235349pab.0 for ; Tue, 10 Nov 2015 08:18:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nicira_com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=Sd/3QWMrfMoBXkeRxWYN8CjS4pDhFAFWVpI8emfRgO4=; b=2T7jj6n+23ZUBK/sFlDuwOPmFqiPWRjzvX1bXcDuPru/q7x3jsJZVKMhP6BxdvMJZA fp/gChnRkomqLRWStzgJT7FT80QYhu3BdMqJCi0wuXa43i5L/S3uzVDZfMbLJcr2KdWf RrNkqUX5QLDONyqpuDDZhO16eeyq6PCQYHqq9ZA3F0OaQXh59M88l7ja7UJal59RmOYd QYVHobYXvkiLNgom7Ab83+IMLjvMBeZtf3TB01cabLde9UhYxCSKc1ukEuI82uCb6y1u pROIePd253yInz9lYJk+uOGpiWCrcvU6p5n5y5WJ33RFT8tbH0uRC8JpkqnvjPsDkHU8 iBdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Sd/3QWMrfMoBXkeRxWYN8CjS4pDhFAFWVpI8emfRgO4=; b=EIOjNBPvPF8bihJKr/C3NCwEIhq1aLD1xIGlFrcHjyV3knD+jq2UKOlTmK/8eQ9waE 6a+zRfD2394V8Ahh6rImG4byF6QIuW+D9kkqiKYvUqc9djcCeL7DgppVF0filjVk4YVY 4R5bZp0bVUaXbTFCDACKr8cEZsh7O+YZLitbp0hl+xwvOjCUiQsk9/W++bSL4VDZUhmv pcA9WsbR/W/FB3Vgh4r8fGPVEY2rfigOS1nnk06YDvwBXkEnYuU9SfHnm8a6ezPRZQvm Ue2xzalfL1lRKsztfVjrEs9nY7VOJr8thqMYKwJ+lYC/nr2KlhWgs7elVAR+F7CDBBWN h62A== X-Gm-Message-State: ALoCoQmSlxkoddPPuGOllaxLd+t8n98FSmo6FpyJxF4Dqlh2fDPMrzAA8F+4RgpN347/GCKEqc7C X-Received: by 10.66.216.38 with SMTP id on6mr6936366pac.53.1447172308312; Tue, 10 Nov 2015 08:18:28 -0800 (PST) Received: from localhost.localdomain ([117.195.119.197]) by smtp.gmail.com with ESMTPSA id bz1sm4926661pab.20.2015.11.10.08.18.26 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Nov 2015 08:18:27 -0800 (PST) X-CudaMail-Envelope-Sender: pshelar@nicira.com X-Barracuda-Apparent-Source-IP: 117.195.119.197 From: Pravin B Shelar To: dev@openvswitch.org X-CudaMail-Whitelist-To: dev@openvswitch.org X-CudaMail-MID: CM-V2-1109025995 X-CudaMail-DTE: 111015 X-CudaMail-Originating-IP: 209.85.220.49 Date: Tue, 10 Nov 2015 08:18:20 -0800 X-ASG-Orig-Subj: [##CM-V2-1109025995##][PATCH] datapath: Fix inet_get_local_port_range() backport. Message-Id: <1447172300-10831-1-git-send-email-pshelar@nicira.com> X-Mailer: git-send-email 1.8.3.1 X-Barracuda-Connect: UNKNOWN[192.168.14.1] X-Barracuda-Start-Time: 1447172309 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] datapath: Fix inet_get_local_port_range() backport. 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" Remove unnecessary check and definition of inet_get_local_port_range. It is already there in ip.h Reported-by: Joe Stringer Signed-off-by: Pravin B Shelar --- datapath/linux/compat/include/net/udp.h | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/datapath/linux/compat/include/net/udp.h b/datapath/linux/compat/include/net/udp.h index fcb8f6a..d078b79 100644 --- a/datapath/linux/compat/include/net/udp.h +++ b/datapath/linux/compat/include/net/udp.h @@ -1,17 +1,7 @@ #ifndef __NET_UDP_WRAPPER_H #define __NET_UDP_WRAPPER_H 1 -#include - -#ifdef inet_get_local_port_range -/* RHEL7 backports udp_flow_src_port() using an older version of - * inet_get_local_port_range(). */ -#undef inet_get_local_port_range -#include_next -#define inet_get_local_port_range rpl_inet_get_local_port_range -#else #include_next -#endif #ifndef HAVE_UDP_FLOW_SRC_PORT static inline __be16 rpl_udp_flow_src_port(struct net *net, struct sk_buff *skb,