From patchwork Wed May 17 08:47:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 99921 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp130168qge; Wed, 17 May 2017 01:48:36 -0700 (PDT) X-Received: by 10.84.129.131 with SMTP id b3mr2992059plb.1.1495010916872; Wed, 17 May 2017 01:48:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1495010916; cv=none; d=google.com; s=arc-20160816; b=rC0aDDEyCYqKeCfomE6qeM6IZepbg55nx8L1Yg5xfwCnIgtVq59Bgwb+h7RRIVa5a7 wFaGckPh+kf6WhlUbvCbBP/vjuiQHnyZlryi7XNOCAFzxDsV7OdRc7EHuF7eveO2muAs eALfzvajLcH4Os04NKzsFLrCei/zXab/ZA/YjxkN1YA/AVqUes4de69dFgO0NiK+fty7 Uq7OAA2bp669qD067/pwh59SIhRHBUaaA7Xe+a6SQlsTV0VyhhPQhDcDDYSr7DK+T0bI chGQZMtytMx0Qs1mtrZHCHvXAw6lLMeL0hxJecUSi9QeIsS34TaLDJ/bP4TiNfR+/mdS g6iw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=ezM10RjK+jXQT7hx0jPHMRhWsDlKNN5vsmC+XU00lhc=; b=YWT/AH4R902xJQSDdauZAp3uWR5yPcb0ILHgsRLIVmkbPDf2BM/qI+/rezTsydvu65 bzS42O0LFe4iLlSJcSsF3PT0j5Jhc9sgWGgkuCu3nkaifxb5h+oQB0nxWYcsFttuhXa2 VvANbzAthH29cnvC580D2URHhlihKSVuupLhDzAzTUHmQy1VRkj1W4wFZvPLQeaGSHY0 uCZ27Zu0i+K6u1hAVXa0i6CYDX3HQLIKEBDQa/jRK9RixQMapcy+uHCy/v3vbSEYcvma UM1Vds2kfo6cIfzNue40BhJE8WAIC6385uB9iyBjnM3mbtcoYrE3s+Qkp7sIvcvOllFC /N4w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s26si1521022pge.221.2017.05.17.01.48.36; Wed, 17 May 2017 01:48:36 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752913AbdEQIsQ (ORCPT + 6 others); Wed, 17 May 2017 04:48:16 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:63773 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751216AbdEQIsN (ORCPT ); Wed, 17 May 2017 04:48:13 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue001 [212.227.15.129]) with ESMTPA (Nemesis) id 0MB6xw-1dIdrk1YyS-009wsJ; Wed, 17 May 2017 10:48:04 +0200 From: Arnd Bergmann To: "David S. Miller" Cc: Arnd Bergmann , Eric Dumazet , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] net: always include tcp.h in sock.c Date: Wed, 17 May 2017 10:47:35 +0200 Message-Id: <20170517084800.1272163-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:oDA1KxWSsTjNCszfMI3LE5ZxuLrn7CbrarxXsIEJZ8gtFQojFkJ 4+E+lH450+Zr4kuzxzzUHpqrYzIk9eUfqmiiHp5R1TN0XzQsiK/9YYyYFpOddIGtsY1GdyC 47r/5R6kHCMPkI4Hhjjw5eGtLsDvGyx4zx9EK0zNy2BHPmPUEtIwX5LGSRo1dBbCmXzOEPo mxQfdPEWPNkt8JkhG/75A== X-UI-Out-Filterresults: notjunk:1; V01:K0:Temuqeq4Ty0=:pUft+eXHls6uV0wxPnHR0Q qaiUM0IvGItkN1VUg1P1XiLMi8XCR4EJHRaS60mJHQzZTWngLgotuByS+VC4MXEpAkUGE2oNC PSVPi+kdvE3e6Zv1UBKaoJr+Wx8smCoBkSKvoMLMkfqc1FoTFj1vgcWr6igF5htEKiICLIU8A XA1jA4XoM0+pBt/oTPY5D+7bZuUVhpAdcBMrlI5BaoCvuLS+ZJqJr/yxFooVloWPoWr6Mj9VV +uc4vxBblK/ZQIWBDNB0YhXttQYQbIUvg/Jk4CiS9QC7UzKEGMGtiYJ7Xo4APiWtHFSSyc0qS XSrARjKcyCy7QtjWw4z2+Pfsj4gZx7mR87rKSjM/HWXAOBYjncDj/wbYSrB9VkAMv6qNL8tDC Y/m3u/PQMioOqZYbbt5AW7S+F6fYck4h+qOTCthjMJ5xdtpy2G5HiYq1AG0zNsje9YSJmcPat WsXjNRrBet2eLNcLiG8pXHhp084hTL1ebMp+LpauhGcyNj4C5kg+OMS4M/43uLSUygIFyVtwT o35TbWvWmYUW2xehQC831NdWZbTdA5BSvK0WeGxBJi8VUBC0/SXdbb+Kxv1EK/TAC7brcGDkB YvGqzFtpNiKWsnZVPdHlzYapK3pHuHMsUWCg6Y4NBgqVuVTgx8qjqkLx16XrjfnXBm6RBEIgb H0IKGl4c+6Ofv5FvVKjL5+msl+/tBbYtKrfjcO8tuR/xhN2WDb6jtC+p9RQZP7iMZC0M= Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org kernelci reports a build regression in the latest 4.12 snapshots in configurations without TCP: net/core/sock.c: In function 'skb_orphan_partial': net/core/sock.c:1810:6: error: implicit declaration of function 'skb_is_tcp_pure_ack' [-Werror=implicit-function-declaration] The declaration is simply missing because the header is included conditionally. There is no real reason to leave out the header, so this just removes the #ifdef. Fixes: f6ba8d33cfbb ("netem: fix skb_orphan_partial()") Signed-off-by: Arnd Bergmann --- net/core/sock.c | 3 --- 1 file changed, 3 deletions(-) -- 2.9.0 diff --git a/net/core/sock.c b/net/core/sock.c index e43e71d7856b..727f924b7f91 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -139,10 +139,7 @@ #include -#ifdef CONFIG_INET #include -#endif - #include static DEFINE_MUTEX(proto_list_mutex);