From 7ed4986491b19714e5bc6e95136c1f8217bae4e7 Mon Sep 17 00:00:00 2001
From: Vincent Bernat <bernat@luffy.cx>
Date: Tue, 30 Oct 2012 10:27:16 +0000
Subject: [PATCH] --- yaml --- r: 340639 b: refs/heads/master c:
 afb97186f5d8f1d552298e7423e84c4282e48b92 h: refs/heads/master i:   340637:
 d2a4892efda3a5f471ddc1a52b04ff3ec97ec1d4   340635:
 d809eb15e18b91f308c8ed292e3ba6630242bba4   340631:
 df65966ab6b85050a6ae91e727af1d0dbb04f61e   340623:
 412e92a873046df5de68071269fd21e98bb9b7db   340607:
 ff2778f1729eaba9990138b52ed90e7b33e7fd0c v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/net/vxlan.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c17f561da838..8a181ce79673 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 899a391b75d36b6c46ad2de006b2343cd29edc06
+refs/heads/master: afb97186f5d8f1d552298e7423e84c4282e48b92
diff --git a/trunk/drivers/net/vxlan.c b/trunk/drivers/net/vxlan.c
index 607976c00162..030559dbeb3c 100644
--- a/trunk/drivers/net/vxlan.c
+++ b/trunk/drivers/net/vxlan.c
@@ -1107,6 +1107,9 @@ static int vxlan_newlink(struct net *net, struct net_device *dev,
 	if (data[IFLA_VXLAN_TOS])
 		vxlan->tos  = nla_get_u8(data[IFLA_VXLAN_TOS]);
 
+	if (data[IFLA_VXLAN_TTL])
+		vxlan->ttl = nla_get_u8(data[IFLA_VXLAN_TTL]);
+
 	if (!data[IFLA_VXLAN_LEARNING] || nla_get_u8(data[IFLA_VXLAN_LEARNING]))
 		vxlan->learn = true;