diff mbox series

[v2,net-next,2/2] docs: update ppp_generic.rst to document new ioctls

Message ID 20201201115250.6381-3-tparkin@katalix.com
State New
Headers show
Series [v2,net-next,1/2] ppp: add PPPIOCBRIDGECHAN and PPPIOCUNBRIDGECHAN ioctls | expand

Commit Message

Tom Parkin Dec. 1, 2020, 11:52 a.m. UTC
Add documentation of the newly-added PPPIOCBRIDGECHAN and

Signed-off-by: Tom Parkin <tparkin@katalix.com>
 Documentation/networking/ppp_generic.rst | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
diff mbox series


diff --git a/Documentation/networking/ppp_generic.rst b/Documentation/networking/ppp_generic.rst
index e60504377900..5a10abce5964 100644
--- a/Documentation/networking/ppp_generic.rst
+++ b/Documentation/networking/ppp_generic.rst
@@ -314,6 +314,22 @@  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. The argument should
+  point to an int containing the channel number of the channel to bridge
+  to. 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. Since channel
+  bridging interrupts the normal ppp_input() path, a given channel may
+  not be part of a bridge at the same time as being part of a unit.
+  This ioctl will return an EALREADY error if the channel is already
+  part of a bridge or unit, or ENXIO if the requested channel does not
+  exist.
+* PPPIOCUNBRIDGECHAN performs the inverse of PPPIOCBRIDGECHAN, unbridging
+  a channel pair.  This ioctl will return an EINVAL error if the channel
+  does not form part of a bridge.
 * All other ioctl commands are passed to the channel ioctl() function.
 The ioctl calls that are available on an instance that is attached to