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

Commit 9551583e authored by Steve French's avatar Steve French
Browse files

Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

parents a2653eba 985834a1

Documentation/i2c/busses/i2c-viapro

+2 −4
Original line number Diff line number Diff line
@@ -7,12 +7,10 @@ Supported adapters: 
  * VIA Technologies, Inc. VT82C686A/B

    Datasheet: Sometimes available at the VIA website



  * VIA Technologies, Inc. VT8231, VT8233, VT8233A, VT8235, VT8237

    Datasheet: available on request from Via

  * VIA Technologies, Inc. VT8231, VT8233, VT8233A, VT8235, VT8237R

    Datasheet: available on request from VIA



Authors:

	Frodo Looijaard <frodol@dds.nl>,

	Philip Edelbrock <phil@netroedge.com>,

	Kysti Mlkki <kmalkki@cc.hut.fi>,

	Mark D. Studebaker <mdsxyz123@yahoo.com>,

	Jean Delvare <khali@linux-fr.org>

Documentation/i2c/writing-clients

+2 −2
Original line number Diff line number Diff line
@@ -412,7 +412,7 @@ For now, you can ignore the `flags' parameter. It is there for future use. 
        release_region(address,FOO_EXTENT);

    /* SENSORS ONLY END */

    ERROR1:

      kfree(new_client);

      kfree(data);

    ERROR0:

      return err;

  }
@@ -443,7 +443,7 @@ much simpler than the attachment code, fortunately! 
      release_region(client->addr,LM78_EXTENT);

    /* HYBRID SENSORS CHIP ONLY END */



    kfree(data);

    kfree(i2c_get_clientdata(client));

    return 0;

  }

Documentation/networking/dccp.txt

0 → 100644
+56 −0
Original line number Diff line number Diff line 
DCCP protocol

============



Last updated: 10 November 2005



Contents

========



- Introduction

- Missing features

- Socket options

- Notes



Introduction

============



Datagram Congestion Control Protocol (DCCP) is an unreliable, connection

based protocol designed to solve issues present in UDP and TCP particularly

for real time and multimedia traffic.



It has a base protocol and pluggable congestion control IDs (CCIDs).



It is at draft RFC status and the homepage for DCCP as a protocol is at:

	http://www.icir.org/kohler/dcp/



Missing features

================



The DCCP implementation does not currently have all the features that are in

the draft RFC.



In particular the following are missing:

- CCID2 support

- feature negotiation



When testing against other implementations it appears that elapsed time

options are not coded compliant to the specification.



Socket options

==============



DCCP_SOCKOPT_PACKET_SIZE is used for CCID3 to set default packet size for

calculations.



DCCP_SOCKOPT_SERVICE sets the service. This is compulsory as per the

specification. If you don't set it you will get EPROTO.



Notes

=====



SELinux does not yet have support for DCCP. You will need to turn it off or

else you will get EACCES.



DCCP does not travel through NAT successfully at present. This is because

the checksum covers the psuedo-header as per TCP and UDP. It should be

relatively trivial to add Linux NAT support for DCCP.

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -707,7 +707,7 @@ DCCP PROTOCOL 
P:	Arnaldo Carvalho de Melo

M:	acme@mandriva.com

L:	dccp@vger.kernel.org

W:	http://www.wlug.org.nz/DCCP

W:	http://linux-net.osdl.org/index.php/DCCP

S:	Maintained



DECnet NETWORK LAYER

Makefile

+2 −2
Original line number Diff line number Diff line
@@ -347,7 +347,7 @@ AFLAGS_KERNEL = 
# Needed to be compatible with the O= option

LINUXINCLUDE    := -Iinclude \

                   $(if $(KBUILD_SRC),-Iinclude2 -I$(srctree)/include) \

		   -imacros include/linux/autoconf.h

		   -include include/linux/autoconf.h



CPPFLAGS        := -D__KERNEL__ $(LINUXINCLUDE)
@@ -407,7 +407,7 @@ outputmakefile: 
# of make so .config is not included in this case either (for *config).



no-dot-config-targets := clean mrproper distclean \

			 cscope TAGS tags help %docs check%

			 cscope TAGS tags help %docs check% kernelrelease



config-targets := 0

mixed-targets  := 0