On Wed, Aug 19, 2015 at 11:18 AM, Jesse Gross <je...@nicira.com> wrote: > On Mon, Aug 17, 2015 at 2:11 PM, Pravin B Shelar <pshe...@nicira.com> wrote: >> diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig >> index e58468b..18ff83b 100644 >> --- a/drivers/net/Kconfig >> +++ b/drivers/net/Kconfig >> @@ -181,7 +181,7 @@ config VXLAN >> >> config GENEVE >> tristate "Generic Network Virtualization Encapsulation netdev" >> - depends on INET && GENEVE_CORE >> + depends on INET >> select NET_IP_TUNNEL > > I think my comments on v1 one this patch were overlooked (about the > UDP_TUNNEL dependency and the name). > right, I missed it.
>> diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c >> index 5b43382..eb298ff 100644 >> --- a/drivers/net/geneve.c >> +++ b/drivers/net/geneve.c >> +static void geneve_build_header(struct genevehdr *geneveh, >> + __be16 tun_flags, u8 vni[3], >> + u8 options_len, u8 *options) > [...] >> +static int geneve_build_skb(struct rtable *rt, struct sk_buff *skb, >> + __be16 tun_flags, u8 vni[3], u8 opt_len, u8 *opt, >> + bool csum) > > It seems like we could just merge these functions. I'm not sure that > the role is all that different. > ok. > In geneve_build_skb(), the error labels are somewhat confusing (for > example, free_rt doesn't free the rt). Also, is it right that we don't > free the rt if udp_tunnel_handle_offloads() fails()? It might be > cleaner if the caller retains ownership of rt. > ok. > My guess is that if the issue from the earlier patch about overlapping > collect_md tunnels is fixed then that might allow us to simplify > things a little further, since for those tunnels we can assume there > is a 1:1 mapping between collect_md tunnels and sockets. I dont see how it would be different. Can you elaborate on this ? -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html