From patchwork Thu Nov 26 12:24:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Parkin X-Patchwork-Id: 333501 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=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT 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 4E702C63697 for ; Thu, 26 Nov 2020 12:24:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DEE272087C for ; Thu, 26 Nov 2020 12:24:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=katalix.com header.i=@katalix.com header.b="2tsDPZff" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725911AbgKZMYo (ORCPT ); Thu, 26 Nov 2020 07:24:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46510 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730775AbgKZMYn (ORCPT ); Thu, 26 Nov 2020 07:24:43 -0500 Received: from mail.katalix.com (mail.katalix.com [IPv6:2a05:d01c:827:b342:16d0:7237:f32a:8096]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 2D54AC0617A7 for ; Thu, 26 Nov 2020 04:24:43 -0800 (PST) Received: from localhost.localdomain (82-69-49-219.dsl.in-addr.zen.co.uk [82.69.49.219]) (Authenticated sender: tom) by mail.katalix.com (Postfix) with ESMTPSA id 196CE86B82; Thu, 26 Nov 2020 12:24:42 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=katalix.com; s=mail; t=1606393482; bh=bAkZeI6quyaf2BpyY5/Ib6Uv+UcFWy1pvn6QbwxRP7Q=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:From; z=From:=20Tom=20Parkin=20|To:=20netdev@vger.ke rnel.org|Cc:=20gnault@redhat.com,=0D=0A=09jchapman@katalix.com,=0D =0A=09Tom=20Parkin=20|Subject:=20[PATCH=20net -next=202/2]=20docs:=20update=20ppp_generic.rst=20to=20document=20 new=20ioctls|Date:=20Thu,=2026=20Nov=202020=2012:24:26=20+0000|Mes sage-Id:=20<20201126122426.25243-3-tparkin@katalix.com>|In-Reply-T o:=20<20201126122426.25243-1-tparkin@katalix.com>|References:=20<2 0201126122426.25243-1-tparkin@katalix.com>; b=2tsDPZffgeQFH3RUDTM9n18APf445vnR2tDIhKWZHEKgJrL63KIqCIkLJZiCP0olr BTQDPIwxY4tcUz95zCDiy2+UYuQRh4t/5IWJVW8+97/TycgLbkcDaAAEkSfhQyBw+Y Biqgc0Yn2D/MsAQelfYKsRPEq7r57NcqMON/whtpBcclYHslYweGygBhCvMl1ref8r eHWCPWxr19uDkdjcjAiaYpd37+qVa1AA0En9F/UnhJZnIaiOL8QwIs5NvGH6dwiJwa b9eXJMRDld7t7rsXaj8ZT8Kt4AptkkZZUk2rAYFTCt9Ttm9ZHddRQlN7vUyT6YKDN0 svVz0KoCcr0cw== From: Tom Parkin To: netdev@vger.kernel.org Cc: gnault@redhat.com, jchapman@katalix.com, Tom Parkin Subject: [PATCH net-next 2/2] docs: update ppp_generic.rst to document new ioctls Date: Thu, 26 Nov 2020 12:24:26 +0000 Message-Id: <20201126122426.25243-3-tparkin@katalix.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201126122426.25243-1-tparkin@katalix.com> References: <20201126122426.25243-1-tparkin@katalix.com> Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Add documentation of the newly-added PPPIOCBRIDGECHAN and PPPIOCUNBRIDGECHAN ioctls. Signed-off-by: Tom Parkin --- Documentation/networking/ppp_generic.rst | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Documentation/networking/ppp_generic.rst b/Documentation/networking/ppp_generic.rst index e60504377900..be25f48468a6 100644 --- a/Documentation/networking/ppp_generic.rst +++ b/Documentation/networking/ppp_generic.rst @@ -314,6 +314,15 @@ channel are: it is connected to. It will return an EINVAL error if the channel is not connected to an interface. +* PPPIOCBRIDGECHAN bridges a channel with another. Once two channels + are bridged, frames presented to one channel by ppp_input() are passed + to the bridge instance for onward transmission. This allows frames + to be switched from one channel into another: for example, to pass + PPPoE frames into a PPPoL2TP session. + +* PPPIOCUNBRIDGECHAN performs the inverse of PPPIOCBRIDGECHAN, unbridging + a channel pair. + * All other ioctl commands are passed to the channel ioctl() function. The ioctl calls that are available on an instance that is attached to