From mboxrd@z Thu Jan 1 00:00:00 1970 From: James Chapman Subject: [PATCH net-next 2/4] l2tp: revert "l2tp: fix missing print session offset info" Date: Wed, 3 Jan 2018 22:48:05 +0000 Message-ID: <1515019687-1556-3-git-send-email-jchapman@katalix.com> References: <1515019687-1556-1-git-send-email-jchapman@katalix.com> Cc: g.nault@alphalink.fr, lorenzo.bianconi@redhat.com, liuhangbin@gmail.com, James Chapman To: netdev@vger.kernel.org Return-path: Received: from mail.katalix.com ([82.103.140.233]:34235 "EHLO mail.katalix.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750928AbeACWsP (ORCPT ); Wed, 3 Jan 2018 17:48:15 -0500 In-Reply-To: <1515019687-1556-1-git-send-email-jchapman@katalix.com> Sender: netdev-owner@vger.kernel.org List-ID: Revert commit 820da5357572 ("l2tp: fix missing print session offset info"). The peer_offset parameter is removed. Signed-off-by: James Chapman --- net/l2tp/l2tp_netlink.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/net/l2tp/l2tp_netlink.c b/net/l2tp/l2tp_netlink.c index 7e9c501..a1f24fb 100644 --- a/net/l2tp/l2tp_netlink.c +++ b/net/l2tp/l2tp_netlink.c @@ -761,8 +761,6 @@ static int l2tp_nl_session_send(struct sk_buff *skb, u32 portid, u32 seq, int fl if ((session->ifname[0] && nla_put_string(skb, L2TP_ATTR_IFNAME, session->ifname)) || - (session->offset && - nla_put_u16(skb, L2TP_ATTR_OFFSET, session->offset)) || (session->cookie_len && nla_put(skb, L2TP_ATTR_COOKIE, session->cookie_len, &session->cookie[0])) || -- 1.9.1