]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
l2tp: revert "l2tp: fix missing print session offset info"
authorJames Chapman <jchapman@katalix.com>
Wed, 3 Jan 2018 22:48:05 +0000 (22:48 +0000)
committerStefan Bader <stefan.bader@canonical.com>
Tue, 14 Aug 2018 10:26:56 +0000 (12:26 +0200)
BugLink: http://bugs.launchpad.net/bugs/1780858
commit de3b58bc359a861d5132300f53f95e83f71954b3 upstream.

Revert commit 820da5357572 ("l2tp: fix missing print session offset
info").  The peer_offset parameter is removed.

Signed-off-by: James Chapman <jchapman@katalix.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Cc: Guillaume Nault <g.nault@alphalink.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
net/l2tp/l2tp_netlink.c

index 3b71929b48bc777d4d5ae070c660accf4dede7eb..b644997bdab5692a5b0ee9beb7db05629364c0ea 100644 (file)
@@ -768,8 +768,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])) ||