linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Thierry Reding <thierry.reding@gmail.com>
To: "David S. Miller" <davem@davemloft.net>,
	Eric Dumazet <edumazet@google.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH] ipv6: Unbreak build
Date: Wed,  9 Oct 2013 16:14:23 +0200	[thread overview]
Message-ID: <1381328067-1593-2-git-send-email-treding@nvidia.com> (raw)
In-Reply-To: <1381328067-1593-1-git-send-email-treding@nvidia.com>

IPv6 specific fields in struct sock_common are accessed in various
places even if IPv6 support is disabled. Fix this by including the
fields unconditionally.

Signed-off-by: Thierry Reding <treding@nvidia.com>
---
 include/net/sock.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/include/net/sock.h b/include/net/sock.h
index 7e50df5..c87a8a1 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -192,10 +192,8 @@ struct sock_common {
 	struct net	 	*skc_net;
 #endif
 
-#if IS_ENABLED(CONFIG_IPV6)
 	struct in6_addr		skc_v6_daddr;
 	struct in6_addr		skc_v6_rcv_saddr;
-#endif
 
 	/*
 	 * fields between dontcopy_begin/dontcopy_end
-- 
1.8.4

  reply	other threads:[~2013-10-09 14:16 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-10-09 14:14 linux-next: Tree for Oct 9 Thierry Reding
2013-10-09 14:14 ` Thierry Reding [this message]
2013-10-09 14:41   ` [PATCH] ipv6: Unbreak build Eric Dumazet
2013-10-10 10:48     ` Thierry Reding
2013-10-09 14:14 ` linux-next: manual merge of the clk tree Thierry Reding
2013-10-09 14:14 ` linux-next: manual merge of the drm-intel tree Thierry Reding
2013-10-09 14:14 ` linux-next: manual merge of the imx-mxs tree Thierry Reding
2013-10-09 16:56   ` Fabio Estevam
2013-10-09 14:14 ` linux-next: manual merge of the mvebu tree Thierry Reding
2013-10-09 14:21   ` Jason Cooper
2013-10-09 14:37   ` Jason Cooper
2013-10-10 10:57     ` Thierry Reding
2013-10-10 11:40       ` Jason Cooper
2013-10-09 15:29 ` linux-next: Tree for Oct 9 Guenter Roeck
2013-10-09 15:44   ` Guenter Roeck
2013-10-09 17:55     ` Guenter Roeck

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1381328067-1593-2-git-send-email-treding@nvidia.com \
    --to=thierry.reding@gmail.com \
    --cc=davem@davemloft.net \
    --cc=edumazet@google.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).