Merge branch 'for-david' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6

# To add a new book the only step required is to add the book to the

# list of DOCBOOKS.

DOCBOOKS := wanbook.xml z8530book.xml mcabook.xml \

DOCBOOKS := z8530book.xml mcabook.xml \

	    kernel-hacking.xml kernel-locking.xml deviceiobook.xml \

	    procfs-guide.xml writing_usb_driver.xml networking.xml \

	    kernel-api.xml filesystems.xml lsm.xml usb.xml kgdb.xml \

X!Enet/core/wireless.c

     </sect1>

-->

     <sect1><title>Synchronous PPP</title>

!Edrivers/net/wan/syncppp.c

     </sect1>

  </chapter>

</book>

<?xml version="1.0" encoding="UTF-8"?>

<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"

	"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" []>

<book id="WANGuide">

 <bookinfo>

  <title>Synchronous PPP and Cisco HDLC Programming Guide</title>

  <authorgroup>

   <author>

    <firstname>Alan</firstname>

    <surname>Cox</surname>

    <affiliation>

     <address>

      <email>alan@lxorguk.ukuu.org.uk</email>

     </address>

    </affiliation>

   </author>

  </authorgroup>

  <copyright>

   <year>2000</year>

   <holder>Alan Cox</holder>

  </copyright>

  <legalnotice>

   <para>

     This documentation is free software; you can redistribute

     it and/or modify it under the terms of the GNU General Public

     License as published by the Free Software Foundation; either

     version 2 of the License, or (at your option) any later

     version.

   </para>

   <para>

     This program is distributed in the hope that it will be

     useful, but WITHOUT ANY WARRANTY; without even the implied

     warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

     See the GNU General Public License for more details.

   </para>

   <para>

     You should have received a copy of the GNU General Public

     License along with this program; if not, write to the Free

     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,

     MA 02111-1307 USA

   </para>

   <para>

     For more details see the file COPYING in the source

     distribution of Linux.

   </para>

  </legalnotice>

 </bookinfo>

<toc></toc>

  <chapter id="intro">

      <title>Introduction</title>

  <para>

	The syncppp drivers in Linux provide a fairly complete 

	implementation of Cisco HDLC and a minimal implementation of

	PPP. The longer term goal is to switch the PPP layer to the

	generic PPP interface that is new in Linux 2.3.x. The API should

	remain unchanged when this is done, but support will then be

	available for IPX, compression and other PPP features

  </para>

  </chapter>

  <chapter id="bugs">

     <title>Known Bugs And Assumptions</title>

  <para>

  <variablelist>

    <varlistentry><term>PPP is minimal</term>

    <listitem>

    <para>

	The current PPP implementation is very basic, although sufficient

	for most wan usages.

    </para>

    </listitem></varlistentry>

    <varlistentry><term>Cisco HDLC Quirks</term>

    <listitem>

    <para>

	Currently we do not end all packets with the correct Cisco multicast

	or unicast flags. Nothing appears to mind too much but this should

	be corrected.

    </para>

    </listitem></varlistentry>

  </variablelist>

  </para>

  </chapter>

  <chapter id="pubfunctions">

     <title>Public Functions Provided</title>

!Edrivers/net/wan/syncppp.c

  </chapter>

</book>

Generic HDLC layer currently supports:

1. Frame Relay (ANSI, CCITT, Cisco and no LMI).

1. Frame Relay (ANSI, CCITT, Cisco and no LMI)

   - Normal (routed) and Ethernet-bridged (Ethernet device emulation)

     interfaces can share a single PVC.

   - ARP support (no InARP support in the kernel - there is an

     experimental InARP user-space daemon available on:

     http://www.kernel.org/pub/linux/utils/net/hdlc/).

2. raw HDLC - either IP (IPv4) interface or Ethernet device emulation.

3. Cisco HDLC.

4. PPP (uses syncppp.c).

2. raw HDLC - either IP (IPv4) interface or Ethernet device emulation

3. Cisco HDLC

4. PPP

5. X.25 (uses X.25 routines).

Generic HDLC is a protocol driver only - it needs a low-level driver

obj-$(CONFIG_HDLC_RAW_ETH)	+= hdlc_raw_eth.o

obj-$(CONFIG_HDLC_CISCO)	+= hdlc_cisco.o

obj-$(CONFIG_HDLC_FR)		+= hdlc_fr.o

obj-$(CONFIG_HDLC_PPP)		+= hdlc_ppp.o	syncppp.o

obj-$(CONFIG_HDLC_PPP)		+= hdlc_ppp.o

obj-$(CONFIG_HDLC_X25)		+= hdlc_x25.o

pc300-y				:= pc300_drv.o