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

Commit 985834a1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

parents b8cbfa69 f3b84ec2

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

drivers/atm/horizon.c

+2 −2
Original line number Diff line number Diff line
@@ -1511,8 +1511,8 @@ static inline short setup_idle_tx_channel (hrz_dev * dev, hrz_vcc * vcc) { 
    // a.k.a. prepare the channel and remember that we have done so.

    

    tx_ch_desc * tx_desc = &memmap->tx_descs[tx_channel];

    u16 rd_ptr;

    u16 wr_ptr;

    u32 rd_ptr;

    u32 wr_ptr;

    u16 channel = vcc->channel;

    

    unsigned long flags;

drivers/net/bnx2.c

+5 −11
Original line number Diff line number Diff line
@@ -2707,7 +2707,7 @@ bnx2_init_nvram(struct bnx2 *bp) 


	if (j == entry_count) {

		bp->flash_info = NULL;

		printk(KERN_ALERT "Unknown flash/EEPROM type.\n");

		printk(KERN_ALERT PFX "Unknown flash/EEPROM type.\n");

		rc = -ENODEV;

	}
@@ -3903,6 +3903,8 @@ bnx2_test_loopback(struct bnx2 *bp) 


	pkt_size = 1514;

	skb = dev_alloc_skb(pkt_size);

	if (!skb)

		return -ENOMEM;

	packet = skb_put(skb, pkt_size);

	memcpy(packet, bp->mac_addr, 6);

	memset(packet + 6, 0x0, 8);
@@ -4798,11 +4800,7 @@ bnx2_get_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom, 
  	struct bnx2 *bp = dev->priv;

	int rc;



	if (eeprom->offset > bp->flash_info->total_size)

		return -EINVAL;



	if ((eeprom->offset + eeprom->len) > bp->flash_info->total_size)

		eeprom->len = bp->flash_info->total_size - eeprom->offset;

	/* parameters already validated in ethtool_get_eeprom */



	rc = bnx2_nvram_read(bp, eeprom->offset, eebuf, eeprom->len);
@@ -4816,11 +4814,7 @@ bnx2_set_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom, 
  	struct bnx2 *bp = dev->priv;

	int rc;



	if (eeprom->offset > bp->flash_info->total_size)

		return -EINVAL;



	if ((eeprom->offset + eeprom->len) > bp->flash_info->total_size)

		eeprom->len = bp->flash_info->total_size - eeprom->offset;

	/* parameters already validated in ethtool_set_eeprom */



	rc = bnx2_nvram_write(bp, eeprom->offset, eebuf, eeprom->len);

include/linux/if_ether.h

+3 −1
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ 
#ifndef _LINUX_IF_ETHER_H

#define _LINUX_IF_ETHER_H



#include <linux/types.h>



/*

 *	IEEE 802.3 Ethernet magic constants.  The frame sizes omit the preamble

 *	and FCS/CRC (frame check sequence).
@@ -100,7 +102,7 @@ 
struct ethhdr {

	unsigned char	h_dest[ETH_ALEN];	/* destination eth addr	*/

	unsigned char	h_source[ETH_ALEN];	/* source ether addr	*/

	unsigned short	h_proto;		/* packet type ID field	*/

	__be16		h_proto;		/* packet type ID field	*/

} __attribute__((packed));



#ifdef __KERNEL__