---

yaml --- r: 340639 b: refs/heads/master c: afb9718 h: refs/heads/master i: 340637: d2a4892 340635: d809eb1 340631: df65966 340623: 412e92a 340607: ff2778f v: v3
git-mirror · Nov 3, 2012 · 7ed4986 · 7ed4986
1 parent 999d304
commit 7ed4986
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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;