Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d3c202b authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of ../linux-2.6/

parents 1b04ab45 038eb0ea

Documentation/00-INDEX

+2 −0
Original line number Diff line number Diff line
@@ -109,6 +109,8 @@ cpu-hotplug.txt 
	- document describing CPU hotplug support in the Linux kernel.

cpu-load.txt

	- document describing how CPU load statistics are collected.

cpuidle/

	- info on CPU_IDLE, CPU idle state management subsystem.

cpusets.txt

	- documents the cpusets feature; assign CPUs and Mem to a set of tasks.

cputopology.txt

Documentation/DocBook/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 


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

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

	    procfs-guide.xml writing_usb_driver.xml \

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

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

	    gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \

	    genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml

Documentation/DocBook/filesystems.tmpl

+20 −0
Original line number Diff line number Diff line
@@ -398,4 +398,24 @@ an example. 


  </chapter>



  <chapter id="splice">

      <title>splice API</title>

  <para>

	splice is a method for moving blocks of data around inside the

	kernel, without continually transferring them between the kernel

	and user space.

  </para>

!Ffs/splice.c

  </chapter>



  <chapter id="pipes">

      <title>pipes API</title>

  <para>

	Pipe interfaces are all for in-kernel (builtin image) use.

	They are not exported for use by modules.

  </para>

!Iinclude/linux/pipe_fs_i.h

!Ffs/pipe.c

  </chapter>



</book>

Documentation/DocBook/kernel-api.tmpl

+0 −84
Original line number Diff line number Diff line
@@ -204,65 +204,6 @@ X!Ilib/string.c 
     </sect1>

  </chapter>



  <chapter id="netcore">

     <title>Linux Networking</title>

     <sect1><title>Networking Base Types</title>

!Iinclude/linux/net.h

     </sect1>

     <sect1><title>Socket Buffer Functions</title>

!Iinclude/linux/skbuff.h

!Iinclude/net/sock.h

!Enet/socket.c

!Enet/core/skbuff.c

!Enet/core/sock.c

!Enet/core/datagram.c

!Enet/core/stream.c

     </sect1>

     <sect1><title>Socket Filter</title>

!Enet/core/filter.c

     </sect1>

     <sect1><title>Generic Network Statistics</title>

!Iinclude/linux/gen_stats.h

!Enet/core/gen_stats.c

!Enet/core/gen_estimator.c

     </sect1>

     <sect1><title>SUN RPC subsystem</title>

<!-- The !D functionality is not perfect, garbage has to be protected by comments

!Dnet/sunrpc/sunrpc_syms.c

-->

!Enet/sunrpc/xdr.c

!Enet/sunrpc/svcsock.c

!Enet/sunrpc/sched.c

     </sect1>

  </chapter>



  <chapter id="netdev">

     <title>Network device support</title>

     <sect1><title>Driver Support</title>

!Enet/core/dev.c

!Enet/ethernet/eth.c

!Enet/sched/sch_generic.c

!Iinclude/linux/etherdevice.h

!Iinclude/linux/netdevice.h

     </sect1>

     <sect1><title>PHY Support</title>

!Edrivers/net/phy/phy.c

!Idrivers/net/phy/phy.c

!Edrivers/net/phy/phy_device.c

!Idrivers/net/phy/phy_device.c

!Edrivers/net/phy/mdio_bus.c

!Idrivers/net/phy/mdio_bus.c

     </sect1>

<!-- FIXME: Removed for now since no structured comments in source

     <sect1><title>Wireless</title>

X!Enet/core/wireless.c

     </sect1>

-->

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

!Edrivers/net/wan/syncppp.c

     </sect1>

  </chapter>



  <chapter id="modload">

     <title>Module Support</title>

     <sect1><title>Module Loading</title>
@@ -508,11 +449,6 @@ X!Isound/sound_firmware.c 
!Edrivers/serial/8250.c

  </chapter>



  <chapter id="z85230">

     <title>Z85230 Support Library</title>

!Edrivers/net/wan/z85230.c

  </chapter>



  <chapter id="fbdev">

     <title>Frame Buffer Library</title>
@@ -712,24 +648,4 @@ X!Idrivers/video/console/fonts.c 
!Edrivers/i2c/i2c-core.c

  </chapter>



  <chapter id="splice">

      <title>splice API</title>

  <para>

	splice is a method for moving blocks of data around inside the

	kernel, without continually transferring them between the kernel

	and user space.

  </para>

!Ffs/splice.c

  </chapter>



  <chapter id="pipes">

      <title>pipes API</title>

  <para>

	Pipe interfaces are all for in-kernel (builtin image) use.

	They are not exported for use by modules.

  </para>

!Iinclude/linux/pipe_fs_i.h

!Ffs/pipe.c

  </chapter>



</book>

Documentation/DocBook/networking.tmpl

0 → 100644
+106 −0
Original line number Diff line number Diff line 
<?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="LinuxNetworking">

 <bookinfo>

  <title>Linux Networking and Network Devices APIs</title>



  <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="netcore">

     <title>Linux Networking</title>

     <sect1><title>Networking Base Types</title>

!Iinclude/linux/net.h

     </sect1>

     <sect1><title>Socket Buffer Functions</title>

!Iinclude/linux/skbuff.h

!Iinclude/net/sock.h

!Enet/socket.c

!Enet/core/skbuff.c

!Enet/core/sock.c

!Enet/core/datagram.c

!Enet/core/stream.c

     </sect1>

     <sect1><title>Socket Filter</title>

!Enet/core/filter.c

     </sect1>

     <sect1><title>Generic Network Statistics</title>

!Iinclude/linux/gen_stats.h

!Enet/core/gen_stats.c

!Enet/core/gen_estimator.c

     </sect1>

     <sect1><title>SUN RPC subsystem</title>

<!-- The !D functionality is not perfect, garbage has to be protected by comments

!Dnet/sunrpc/sunrpc_syms.c

-->

!Enet/sunrpc/xdr.c

!Enet/sunrpc/svc_xprt.c

!Enet/sunrpc/xprt.c

!Enet/sunrpc/sched.c

!Enet/sunrpc/socklib.c

!Enet/sunrpc/stats.c

!Enet/sunrpc/rpc_pipe.c

!Enet/sunrpc/rpcb_clnt.c

!Enet/sunrpc/clnt.c

     </sect1>

  </chapter>



  <chapter id="netdev">

     <title>Network device support</title>

     <sect1><title>Driver Support</title>

!Enet/core/dev.c

!Enet/ethernet/eth.c

!Enet/sched/sch_generic.c

!Iinclude/linux/etherdevice.h

!Iinclude/linux/netdevice.h

     </sect1>

     <sect1><title>PHY Support</title>

!Edrivers/net/phy/phy.c

!Idrivers/net/phy/phy.c

!Edrivers/net/phy/phy_device.c

!Idrivers/net/phy/phy_device.c

!Edrivers/net/phy/mdio_bus.c

!Idrivers/net/phy/mdio_bus.c

     </sect1>

<!-- FIXME: Removed for now since no structured comments in source

     <sect1><title>Wireless</title>

X!Enet/core/wireless.c

     </sect1>

-->

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

!Edrivers/net/wan/syncppp.c

     </sect1>

  </chapter>



</book>