---

yaml --- r: 214804 b: refs/heads/master c: b790e01 h: refs/heads/master v: v3
git-mirror · Sep 29, 2010 · d653c93 · d653c93
1 parent 1eb689e
commit d653c93
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8df40d1033d64597dcf1efd4f7547e817f7a953b
+refs/heads/master: b790e01aee74c23a5d92576177934f13aa51f718
diff --git a/trunk/net/ipv4/ip_gre.c b/trunk/net/ipv4/ip_gre.c
@@ -1557,6 +1557,10 @@ static int ipgre_newlink(struct net *src_net, struct net_device *dev, struct nla
 	if (!tb[IFLA_MTU])
 		dev->mtu = mtu;
 
+	/* Can use a lockless transmit, unless we generate output sequences */
+	if (!(nt->parms.o_flags & GRE_SEQ))
+		dev->features |= NETIF_F_LLTX;
+
 	err = register_netdevice(dev);
 	if (err)
 		goto out;