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

Commit 7e472020 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [NetLabel]: update docs with website information
  [NetLabel]: rework the Netlink attribute handling (part 2)
  [NetLabel]: rework the Netlink attribute handling (part 1)
  [Netlink]: add nla_validate_nested()
  [NETLINK]: add nla_for_each_nested() to the interface list
  [NetLabel]: change the SELinux permissions
  [NetLabel]: make the CIPSOv4 cache spinlocks bottom half safe
  [NetLabel]: correct improper handling of non-NetLabel peer contexts
  [TCP]: make cubic the default
  [TCP]: default congestion control menu
  [ATM] he: Fix __init/__devinit conflict
  [NETFILTER]: Add dscp,DSCP headers to header-y
  [DCCP]: Introduce dccp_probe
  [DCCP]: Use constants for CCIDs
  [DCCP]: Introduce constants for CCID numbers
  [DCCP]: Allow default/fallback service code.
parents 7b29122f 4cc67735

Documentation/networking/dccp.txt

+5 −3
Original line number Diff line number Diff line 
DCCP protocol

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



Last updated: 10 November 2005



Contents

========
@@ -42,8 +41,11 @@ 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.

DCCP_SOCKOPT_SERVICE sets the service. The specification mandates use of

service codes (RFC 4340, sec. 8.1.2); if this socket option is not set,

the socket will fall back to 0 (which means that no meaningful service code

is present). Connecting sockets set at most one service option; for

listening sockets, multiple service codes can be specified.



Notes

=====

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -2031,6 +2031,13 @@ L: netfilter@lists.netfilter.org 
L:	netfilter-devel@lists.netfilter.org

S:	Supported



NETLABEL

P:	Paul Moore

M:	paul.moore@hp.com

W:	http://netlabel.sf.net

L:	netdev@vger.kernel.org

S:	Supported



NETROM NETWORK LAYER

P:	Ralf Baechle

M:	ralf@linux-mips.org

drivers/atm/he.c

+8 −8
Original line number Diff line number Diff line
@@ -454,7 +454,7 @@ rate_to_atmf(unsigned rate) /* cps to atm forum format */ 
	return (NONZERO | (exp << 9) | (rate & 0x1ff));

}



static void __init

static void __devinit

he_init_rx_lbfp0(struct he_dev *he_dev)

{

	unsigned i, lbm_offset, lbufd_index, lbuf_addr, lbuf_count;
@@ -485,7 +485,7 @@ he_init_rx_lbfp0(struct he_dev *he_dev) 
	he_writel(he_dev, he_dev->r0_numbuffs, RLBF0_C);

}



static void __init

static void __devinit

he_init_rx_lbfp1(struct he_dev *he_dev)

{

	unsigned i, lbm_offset, lbufd_index, lbuf_addr, lbuf_count;
@@ -516,7 +516,7 @@ he_init_rx_lbfp1(struct he_dev *he_dev) 
	he_writel(he_dev, he_dev->r1_numbuffs, RLBF1_C);

}



static void __init

static void __devinit

he_init_tx_lbfp(struct he_dev *he_dev)

{

	unsigned i, lbm_offset, lbufd_index, lbuf_addr, lbuf_count;
@@ -546,7 +546,7 @@ he_init_tx_lbfp(struct he_dev *he_dev) 
	he_writel(he_dev, lbufd_index - 1, TLBF_T);

}



static int __init

static int __devinit

he_init_tpdrq(struct he_dev *he_dev)

{

	he_dev->tpdrq_base = pci_alloc_consistent(he_dev->pci_dev,
@@ -568,7 +568,7 @@ he_init_tpdrq(struct he_dev *he_dev) 
	return 0;

}



static void __init

static void __devinit

he_init_cs_block(struct he_dev *he_dev)

{

	unsigned clock, rate, delta;
@@ -664,7 +664,7 @@ he_init_cs_block(struct he_dev *he_dev) 


}



static int __init

static int __devinit

he_init_cs_block_rcm(struct he_dev *he_dev)

{

	unsigned (*rategrid)[16][16];
@@ -785,7 +785,7 @@ he_init_cs_block_rcm(struct he_dev *he_dev) 
	return 0;

}



static int __init

static int __devinit

he_init_group(struct he_dev *he_dev, int group)

{

	int i;
@@ -955,7 +955,7 @@ he_init_group(struct he_dev *he_dev, int group) 
	return 0;

}



static int __init

static int __devinit

he_init_irq(struct he_dev *he_dev)

{

	int i;

include/linux/dccp.h

+8 −6
Original line number Diff line number Diff line
@@ -169,6 +169,12 @@ enum { 
	DCCPO_MAX_CCID_SPECIFIC = 255,

};



/* DCCP CCIDS */

enum {

	DCCPC_CCID2 = 2,

	DCCPC_CCID3 = 3,

};



/* DCCP features */

enum {

	DCCPF_RESERVED = 0,
@@ -320,7 +326,7 @@ static inline unsigned int dccp_hdr_len(const struct sk_buff *skb) 
/* initial values for each feature */

#define DCCPF_INITIAL_SEQUENCE_WINDOW		100

#define DCCPF_INITIAL_ACK_RATIO			2

#define DCCPF_INITIAL_CCID			2

#define DCCPF_INITIAL_CCID			DCCPC_CCID2

#define DCCPF_INITIAL_SEND_ACK_VECTOR		1

/* FIXME: for now we're default to 1 but it should really be 0 */

#define DCCPF_INITIAL_SEND_NDP_COUNT		1
@@ -404,6 +410,7 @@ struct dccp_service_list { 
};



#define DCCP_SERVICE_INVALID_VALUE htonl((__u32)-1)

#define DCCP_SERVICE_CODE_IS_ABSENT 		 0



static inline int dccp_list_has_service(const struct dccp_service_list *sl,

					const __be32 service)
@@ -484,11 +491,6 @@ static inline struct dccp_minisock *dccp_msk(const struct sock *sk) 
	return (struct dccp_minisock *)&dccp_sk(sk)->dccps_minisock;

}



static inline int dccp_service_not_initialized(const struct sock *sk)

{

	return dccp_sk(sk)->dccps_service == DCCP_SERVICE_INVALID_VALUE;

}



static inline const char *dccp_role(const struct sock *sk)

{

	switch (dccp_sk(sk)->dccps_role) {

include/linux/netfilter/Kbuild

+2 −0
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ header-y += xt_connmark.h 
header-y += xt_CONNMARK.h

header-y += xt_conntrack.h

header-y += xt_dccp.h

header-y += xt_dscp.h

header-y += xt_DSCP.h

header-y += xt_esp.h

header-y += xt_helper.h

header-y += xt_length.h