From patchwork Sat Jun 28 18:20:54 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Octavian Purdila X-Patchwork-Id: 365292 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 7C589140097 for ; Sun, 29 Jun 2014 04:21:15 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756170AbaF1SVJ (ORCPT ); Sat, 28 Jun 2014 14:21:09 -0400 Received: from mga02.intel.com ([134.134.136.20]:49184 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752015AbaF1SVH (ORCPT ); Sat, 28 Jun 2014 14:21:07 -0400 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP; 28 Jun 2014 11:21:06 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.01,567,1400050800"; d="scan'208";a="535967643" Received: from unknown (HELO opurdila-mobl1.amr.corp.intel.com) ([10.255.13.40]) by orsmga001.jf.intel.com with ESMTP; 28 Jun 2014 11:21:05 -0700 From: Octavian Purdila To: davem@davemloft.net Cc: netdev@vger.kernel.org, Octavian Purdila Subject: [PATCH net-next] tcp: tcp_conn_request: fix build error when IPv6 is disabled Date: Sat, 28 Jun 2014 21:20:54 +0300 Message-Id: <1403979654-7738-1-git-send-email-octavian.purdila@intel.com> X-Mailer: git-send-email 1.8.3.2 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Fixes build error introduced by commit 1fb6f159fd21c64 (tcp: add tcp_conn_request): net/ipv4/tcp_input.c: In function 'pr_drop_req': net/ipv4/tcp_input.c:5889:130: error: 'struct sock_common' has no member named 'skc_v6_daddr' Reported-by: kbuild test robot Signed-off-by: Octavian Purdila --- net/ipv4/tcp_input.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 97e48d6..bb68496 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -5885,9 +5885,11 @@ static inline void pr_drop_req(struct request_sock *req, __u16 port, int family) if (family == AF_INET) LIMIT_NETDEBUG(KERN_DEBUG pr_fmt("drop open request from %pI4/%u\n"), &ireq->ir_rmt_addr, port); - else +#if IS_ENABLED(CONFIG_IPV6) + else if (family == AF_INET6) LIMIT_NETDEBUG(KERN_DEBUG pr_fmt("drop open request from %pI6/%u\n"), &ireq->ir_v6_rmt_addr, port); +#endif } int tcp_conn_request(struct request_sock_ops *rsk_ops,