From: Jesse Gross Date: Wed, 3 Feb 2010 00:01:00 +0000 (-0500) Subject: gre: Network namespace upon device creation. X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2498a57d986d1c4248230d97d6f3f2db9f1c2b53;p=openvswitch gre: Network namespace upon device creation. gre: Optimize tx path. Ports commit 81adee "net: Support specifying the network namespace upon device creation." from the mainline kernel. --- diff --git a/datapath/linux-2.6/compat-2.6/ip_gre.c b/datapath/linux-2.6/compat-2.6/ip_gre.c index 7b23d1aa..2f1a9adb 100644 --- a/datapath/linux-2.6/compat-2.6/ip_gre.c +++ b/datapath/linux-2.6/compat-2.6/ip_gre.c @@ -1661,8 +1661,13 @@ static void ipgre_netlink_parms(struct nlattr *data[], parms->iph.frag_off = htons(IP_DF); } +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33) +static int ipgre_newlink(struct net *src_net, struct net_device *dev, struct nlattr *tb[], + struct nlattr *data[]) +#else static int ipgre_newlink(struct net_device *dev, struct nlattr *tb[], struct nlattr *data[]) +#endif { struct ip_tunnel *nt; struct net *net = dev_net(dev);