From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.4 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT, USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C8F66C433E0 for ; Thu, 21 May 2020 23:39:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A04B720814 for ; Thu, 21 May 2020 23:39:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="oCh9ZWBN" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729916AbgEUXjv (ORCPT ); Thu, 21 May 2020 19:39:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56634 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728706AbgEUXjv (ORCPT ); Thu, 21 May 2020 19:39:51 -0400 Received: from mail-qk1-x749.google.com (mail-qk1-x749.google.com [IPv6:2607:f8b0:4864:20::749]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B4572C061A0E for ; Thu, 21 May 2020 16:39:49 -0700 (PDT) Received: by mail-qk1-x749.google.com with SMTP id p5so4088703qkg.12 for ; Thu, 21 May 2020 16:39:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc:content-transfer-encoding; bh=gubGlzhk9j5tTpZqS+qnOQcAm29HEDBYodlcgClRy+4=; b=oCh9ZWBNAw/bOjncg/0PEI8DbLS91voT66/GJer6phvb2PDC1FN7x+x1dIxV/s97CK sxU90mYvvVZOzPUndjPcwnWtpyAI9MT4NJoiUrbNbFprGgVWdIuOVfYFGvgHKKGlmr61 w0cb45mAMIg8SxXt8T5uClFeSxNZ42rYGvOWuTETRGedSHEKyBEn8BmgD5g6F+ljVYcf bjiR06aXRN7vJIdc1HFOBVcIf4L+aB7zUs+FpMEQSKvlpRdIh2Oe7Llkg3UvdAvqSJal CPPHwt5aN3YOSiT5btd96mQL8d2GyCOPLwim5A01y8AgQLSTl0YRQQTmxQhO7Wy40w80 ZU9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc:content-transfer-encoding; bh=gubGlzhk9j5tTpZqS+qnOQcAm29HEDBYodlcgClRy+4=; b=WowfKYHL5eascAv7TZpGzKNLjZoL+xRjjn20v1Q0q+XuUkXnKk+x1PELZoTBfp/X6f IrYDQ3AjJFPu7g6c6Q4hIKfqgv3zwZnCnvon+WRb4XDOaEQVj4xBMG64sDDUQrJ+JUhN SbWmkC9eiUbnOwKu6vu4mB54gf+J+I3dt622Ui6nbtldFKDbGn+XeXOtoKnB7+kC9s1V VvE5QF0V1LW3jriPHGQBXbWCvAuzKfwR5RQ1LVlZHsSQuwp3R9pu1/WVLDCrXeqNpvqX 2kpbu5/pHn2Hs3xmr4p9AwER9f8xK7BuKfTXW6mkEaRasABz2lsAQKXkuelYk3m3Z+hm NLog== X-Gm-Message-State: AOAM530RIO/PssRSxXJNKVEMwJ+kZ04XLdh9ypPMzINYp2uBruqZ1Nky l/Io8hrQT8Ezu/iS8nf/biN/XRn+ZMCkSA== X-Google-Smtp-Source: ABdhPJwyelLnkBa6RgtJh2IoyfyixbQYLGUjfvcYcldYIlyXOUw7i4US+M56tYDnYG4VL5tmvi/xJG7/jWBFyA== X-Received: by 2002:ad4:5629:: with SMTP id cb9mr1200311qvb.181.1590104388946; Thu, 21 May 2020 16:39:48 -0700 (PDT) Date: Fri, 22 May 2020 00:39:17 +0100 In-Reply-To: <20200521233937.175182-1-gprocida@google.com> Message-Id: <20200521233937.175182-3-gprocida@google.com> Mime-Version: 1.0 References: <20200521144100.128936-1-gprocida@google.com> <20200521233937.175182-1-gprocida@google.com> X-Mailer: git-send-email 2.27.0.rc0.183.gde8f92d652-goog Subject: [PATCH v2 02/22] net: l2tp: deprecate PPPOL2TP_MSG_* in favour of L2TP_MSG_* From: Giuliano Procida To: greg@kroah.com Cc: stable@vger.kernel.org, "=?UTF-8?q?Asbj=C3=B8rn=20Sloth=20T=C3=B8nnesen?=" , "David S . Miller" , Giuliano Procida Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Asbj=C3=B8rn Sloth T=C3=B8nnesen commit 47c3e7783be4e142b861d34b5c2e223330b05d8a upstream. PPPOL2TP_MSG_* and L2TP_MSG_* are duplicates, and are being used interchangeably in the kernel, so let's standardize on L2TP_MSG_* internally, and keep PPPOL2TP_MSG_* defined in UAPI for compatibility. Signed-off-by: Asbjoern Sloth Toennesen Signed-off-by: David S. Miller Signed-off-by: Giuliano Procida --- Documentation/networking/l2tp.txt | 8 ++++---- include/uapi/linux/if_pppol2tp.h | 13 ++++++------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/Documentation/networking/l2tp.txt b/Documentation/networking/l= 2tp.txt index 4650a00ed012..9bc271cdc9a8 100644 --- a/Documentation/networking/l2tp.txt +++ b/Documentation/networking/l2tp.txt @@ -177,10 +177,10 @@ setsockopt on the PPPoX socket to set a debug mask. =20 The following debug mask bits are available: =20 -PPPOL2TP_MSG_DEBUG verbose debug (if compiled in) -PPPOL2TP_MSG_CONTROL userspace - kernel interface -PPPOL2TP_MSG_SEQ sequence numbers handling -PPPOL2TP_MSG_DATA data packets +L2TP_MSG_DEBUG verbose debug (if compiled in) +L2TP_MSG_CONTROL userspace - kernel interface +L2TP_MSG_SEQ sequence numbers handling +L2TP_MSG_DATA data packets =20 If enabled, files under a l2tp debugfs directory can be used to dump kernel state about L2TP tunnels and sessions. To access it, the diff --git a/include/uapi/linux/if_pppol2tp.h b/include/uapi/linux/if_pppol= 2tp.h index 4bd1f55d6377..6418c4d10241 100644 --- a/include/uapi/linux/if_pppol2tp.h +++ b/include/uapi/linux/if_pppol2tp.h @@ -18,6 +18,7 @@ #include #include #include +#include =20 /* Structure used to connect() the socket to a particular tunnel UDP * socket over IPv4. @@ -90,14 +91,12 @@ enum { PPPOL2TP_SO_REORDERTO =3D 5, }; =20 -/* Debug message categories for the DEBUG socket option */ +/* Debug message categories for the DEBUG socket option (deprecated) */ enum { - PPPOL2TP_MSG_DEBUG =3D (1 << 0), /* verbose debug (if - * compiled in) */ - PPPOL2TP_MSG_CONTROL =3D (1 << 1), /* userspace - kernel - * interface */ - PPPOL2TP_MSG_SEQ =3D (1 << 2), /* sequence numbers */ - PPPOL2TP_MSG_DATA =3D (1 << 3), /* data packets */ + PPPOL2TP_MSG_DEBUG =3D L2TP_MSG_DEBUG, + PPPOL2TP_MSG_CONTROL =3D L2TP_MSG_CONTROL, + PPPOL2TP_MSG_SEQ =3D L2TP_MSG_SEQ, + PPPOL2TP_MSG_DATA =3D L2TP_MSG_DATA, }; =20 =20 --=20 2.27.0.rc0.183.gde8f92d652-goog