---

yaml --- r: 340497 b: refs/heads/master c: e269ed2 h: refs/heads/master i: 340495: 3c58288 v: v3
git-mirror · Oct 26, 2012 · f3ddbfb · f3ddbfb
1 parent 5f892c3
commit f3ddbfb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0f15b1511ad2e82a6b422d275c369e92242854e6
+refs/heads/master: e269ed26d4c9e6da1614709c1bf4c50ff8c8c5b3
diff --git a/trunk/net/l2tp/l2tp_netlink.c b/trunk/net/l2tp/l2tp_netlink.c
@@ -632,7 +632,7 @@ static int l2tp_nl_session_send(struct sk_buff *skb, u32 portid, u32 seq, int fl
 	     nla_put_u16(skb, L2TP_ATTR_MRU, session->mru)))
 		goto nla_put_failure;
 
-	if ((session->ifname && session->ifname[0] &&
+	if ((session->ifname[0] &&
 	     nla_put_string(skb, L2TP_ATTR_IFNAME, session->ifname)) ||
 	    (session->cookie_len &&
 	     nla_put(skb, L2TP_ATTR_COOKIE, session->cookie_len,