netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Tom Herbert <therbert@google.com>
To: David Miller <davem@davemloft.net>
Cc: Andy Zhou <azhou@nicira.com>, Linux Netdev List <netdev@vger.kernel.org>
Subject: Re: [net-next] udp_tunnel: Only build ip6_udp_tunnel.c when IPV6 is selected
Date: Sat, 20 Sep 2014 16:14:47 -0700	[thread overview]
Message-ID: <CA+mtBx-U+198m671ebOZikiQhT3fEBOSQK6My7SNZ4DtPJCuAQ@mail.gmail.com> (raw)
In-Reply-To: <20140919.220620.557633612726378260.davem@davemloft.net>

On Fri, Sep 19, 2014 at 7:06 PM, David Miller <davem@davemloft.net> wrote:
> From: Andy Zhou <azhou@nicira.com>
> Date: Fri, 19 Sep 2014 18:02:53 -0700
>
>> Functions supplied in ip6_udp_tunnel.c are only needed when IPV6 is
>> selected. When IPV6 is not selected, those functions are stubbed out
>> in udp_tunnel.h.
>>
>> ==================================================================
>>  net/ipv6/ip6_udp_tunnel.c:15:5: error: redefinition of 'udp_sock_create6'
>>      int udp_sock_create6(struct net *net, struct udp_port_cfg *cfg,
>>  In file included from net/ipv6/ip6_udp_tunnel.c:9:0:
>>       include/net/udp_tunnel.h:36:19: note: previous definition of 'udp_sock_create6' was here
>>        static inline int udp_sock_create6(struct net *net, struct udp_port_cfg *cfg,
>> ==================================================================
>>
>> Fixes:  fd384412e udp_tunnel: Seperate ipv6 functions into its own file
>> Reported-by: kbuild test robot <fengguang.wu@intel.com>
>> Signed-off-by: Andy Zhou <azhou@nicira.com>
>
> Applied, thanks Andy.

David, what branch did you apply this to? I pulled from your net-next
but don't see this patch...

Thanks,
Tom

> --
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

  reply	other threads:[~2014-09-20 23:14 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-09-20  1:02 [net-next] udp_tunnel: Only build ip6_udp_tunnel.c when IPV6 is selected Andy Zhou
2014-09-20  2:06 ` David Miller
2014-09-20 23:14   ` Tom Herbert [this message]
2014-09-21  1:38     ` David Miller

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=CA+mtBx-U+198m671ebOZikiQhT3fEBOSQK6My7SNZ4DtPJCuAQ@mail.gmail.com \
    --to=therbert@google.com \
    --cc=azhou@nicira.com \
    --cc=davem@davemloft.net \
    --cc=netdev@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).