From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1886372-1527163692-2-389552079153572003 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.25, MAILING_LIST_MULTI -1, RCVD_IN_DNSWL_HI -5, LANGUAGES unknown, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='org', MailFrom='org' X-Spam-charsets: plain='UTF-8' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=fm2; t= 1527163691; b=Pr7QJ9KvPu8PT5fR3Gks7cqaHglO13M/Hmq1QSpbdWk8bfTzxt E8MuB3/LwEmnzi4z3r6rUluZCyWRhCfPE3B6fk7K3IqBFzU9DeLD2wnx0SDJ8e6e sw2zeMqn+rRMD3mFYWnew1mL8Uhqy2rPm8UsGwXHeZd16n65dpolafE7UgP53mo4 QrkJ9eDOhvvYEtpzSUQ+8ERL9Df1FT1nnYcs7pjc+xgF9yRqtpdZykpawozZTLSh wcx9AHjKEepnDwOlUO1TyfGb+rA+Q0goP7MOlIROIBuxb9lgup3i6hUihDcu4nW+ kMnpwOlqwxpdg4pkpotgqGXYCdLNlIrovSyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-type:sender :list-id; s=fm2; t=1527163691; bh=AVAEvmGbVv7GuLMpjPe3yxpfGx4UMd i5K4vvXqsAM0g=; b=jlwvWC7NQiWfyycZooURhnlwLL422x4dwlyv/vzybKRkTX 1ORh9w+ik5mgfoTeDTXnsQ3uyhE4jhk6iSjdOhE/PmXtBgwYsWs1rXtNymtVEopP Fse5ZVeTuJZdyzQWsfbGZA/0Dq9AqeCgb5azGze3ngDTOqrkvBZ99WLgC0QmOEGh r4y23B8Ar0KOjZv81gXPlpDSi+2WCKoTMzhSU44LS59TKKggRfQj9bLShx4axreY epqdS0uLTULkQ/WtGRaNj98xYPS6AZndSoFbboCjhO1c36ydz2erQwSCWBqcTXv3 qNOPm621xh1ltEkCBL1moBXVRiEL+FYwguvFmpgw== ARC-Authentication-Results: i=1; mx6.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=kernel.org header.i=@kernel.org header.b=xZWignIb x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=default; dmarc=none (p=none,has-list-id=yes,d=none) header.from=linuxfoundation.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-cm=none score=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=linuxfoundation.org header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 Authentication-Results: mx6.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=kernel.org header.i=@kernel.org header.b=xZWignIb x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=default; dmarc=none (p=none,has-list-id=yes,d=none) header.from=linuxfoundation.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-cm=none score=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=linuxfoundation.org header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 X-ME-VSCategory: clean X-CM-Envelope: MS4wfCJ5UNas9rpCyodj7ZSXa6MTkRCevkDFgKJJTmkZlCnJuB51XjBYw2nlUK86TAZv3u0+pyUY0iQGYwdtBf63qvsLsY3tu/+GRoUpnROz+jLkbmwVJi/L jK7Wg5RgmJIcq9OIoT/l0q+N+ibkW1pKpQOLz5D8O21rFWUtLdOPe4t4q3rZ8jpX9lmW6t6gQUM+jUNOIp83oRh1c3rEUeM4H8p8dbJCoJniRnYofUY2or34 X-CM-Analysis: v=2.3 cv=FKU1Odgs c=1 sm=1 tr=0 a=UK1r566ZdBxH71SXbqIOeA==:117 a=UK1r566ZdBxH71SXbqIOeA==:17 a=IkcTkHD0fZMA:10 a=VUJBJC2UJ8kA:10 a=9-efGfXaAAAA:8 a=J1Y8HTJGAAAA:8 a=ag1SF4gXAAAA:8 a=MLiVjpLBtXPEc2nvV38A:9 a=QEXdDO2ut3YA:10 a=76mzCeYM3W7A2q4738_3:22 a=y1Q9-5lHfBjTkpIzbSAN:22 a=Yupwre4RP9_Eg_Bd0iYG:22 X-ME-CMScore: 0 X-ME-CMCategory: none Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966543AbeEXJnx (ORCPT ); Thu, 24 May 2018 05:43:53 -0400 Received: from mail.kernel.org ([198.145.29.99]:55238 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966534AbeEXJnu (ORCPT ); Thu, 24 May 2018 05:43:50 -0400 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, James Chapman , "David S. Miller" , Guillaume Nault Subject: [PATCH 4.4 29/92] l2tp: revert "l2tp: fix missing print session offset info" Date: Thu, 24 May 2018 11:38:06 +0200 Message-Id: <20180524093201.741115037@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180524093159.286472249@linuxfoundation.org> References: <20180524093159.286472249@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: James Chapman commit de3b58bc359a861d5132300f53f95e83f71954b3 upstream. Revert commit 820da5357572 ("l2tp: fix missing print session offset info"). The peer_offset parameter is removed. Signed-off-by: James Chapman Signed-off-by: David S. Miller Cc: Guillaume Nault Signed-off-by: Greg Kroah-Hartman --- net/l2tp/l2tp_netlink.c | 2 -- 1 file changed, 2 deletions(-) --- a/net/l2tp/l2tp_netlink.c +++ b/net/l2tp/l2tp_netlink.c @@ -732,8 +732,6 @@ static int l2tp_nl_session_send(struct s 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])) ||