diff --git a/[refs] b/[refs]
index 04ef931a6daa..72bc9fe60617 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b790e01aee74c23a5d92576177934f13aa51f718
+refs/heads/master: 153f0943382e9ae0bff7caa110a1a4656088d0d4
diff --git a/trunk/net/ipv4/ipip.c b/trunk/net/ipv4/ipip.c
index 9e78f11da786..6ad46c28ede2 100644
--- a/trunk/net/ipv4/ipip.c
+++ b/trunk/net/ipv4/ipip.c
@@ -767,6 +767,7 @@ static void ipip_tunnel_setup(struct net_device *dev)
 	dev->iflink		= 0;
 	dev->addr_len		= 4;
 	dev->features		|= NETIF_F_NETNS_LOCAL;
+	dev->features		|= NETIF_F_LLTX;
 	dev->priv_flags		&= ~IFF_XMIT_DST_RELEASE;
 }