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

Commit 1a324727 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

parents db93a82f 461ddf3b

Documentation/DocBook/kernel-api.tmpl

+4 −2
Original line number Diff line number Diff line
@@ -237,8 +237,10 @@ X!Ilib/string.c 
     <sect1><title>Driver Support</title>

!Enet/core/dev.c

!Enet/ethernet/eth.c

!Einclude/linux/etherdevice.h

!Enet/core/wireless.c

!Iinclude/linux/etherdevice.h

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

X!Enet/core/wireless.c

-->

     </sect1>

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

!Edrivers/net/wan/syncppp.c

fs/compat_ioctl.c

+3 −5
Original line number Diff line number Diff line
@@ -686,7 +686,8 @@ static int dev_ifconf(unsigned int fd, unsigned int cmd, unsigned long arg) 


	ifr = ifc.ifc_req;

	ifr32 = compat_ptr(ifc32.ifcbuf);

	for (i = 0, j = 0; i < ifc32.ifc_len && j < ifc.ifc_len;

	for (i = 0, j = 0;

             i + sizeof (struct ifreq32) < ifc32.ifc_len && j < ifc.ifc_len;

	     i += sizeof (struct ifreq32), j += sizeof (struct ifreq)) {

		if (copy_in_user(ifr32, ifr, sizeof (struct ifreq32)))

			return -EFAULT;
@@ -702,10 +703,7 @@ static int dev_ifconf(unsigned int fd, unsigned int cmd, unsigned long arg) 
		i = ((i / sizeof(struct ifreq)) * sizeof(struct ifreq32));

		ifc32.ifc_len = i;

	} else {

		if (i <= ifc32.ifc_len)

		ifc32.ifc_len = i;

		else

			ifc32.ifc_len = i - sizeof (struct ifreq32);

	}

	if (copy_to_user(compat_ptr(arg), &ifc32, sizeof(struct ifconf32)))

		return -EFAULT;

include/linux/netfilter_ipv4/ipt_sctp.h

+5 −7
Original line number Diff line number Diff line
@@ -7,8 +7,6 @@ 


#define IPT_SCTP_VALID_FLAGS		0x07



#define ELEMCOUNT(x) (sizeof(x)/sizeof(x[0]))





struct ipt_sctp_flag_info {

	u_int8_t chunktype;
@@ -59,21 +57,21 @@ struct ipt_sctp_info { 
#define SCTP_CHUNKMAP_RESET(chunkmap) 				\

	do {							\

		int i; 						\

		for (i = 0; i < ELEMCOUNT(chunkmap); i++)	\

		for (i = 0; i < ARRAY_SIZE(chunkmap); i++)	\

			chunkmap[i] = 0;			\

	} while (0)



#define SCTP_CHUNKMAP_SET_ALL(chunkmap) 			\

	do {							\

		int i; 						\

		for (i = 0; i < ELEMCOUNT(chunkmap); i++) 	\

		for (i = 0; i < ARRAY_SIZE(chunkmap); i++)	\

			chunkmap[i] = ~0;			\

	} while (0)



#define SCTP_CHUNKMAP_COPY(destmap, srcmap) 			\

	do {							\

		int i; 						\

		for (i = 0; i < ELEMCOUNT(chunkmap); i++) 	\

		for (i = 0; i < ARRAY_SIZE(chunkmap); i++)	\

			destmap[i] = srcmap[i];			\

	} while (0)
@@ -81,7 +79,7 @@ struct ipt_sctp_info { 
({							\

	int i; 						\

	int flag = 1;					\

	for (i = 0; i < ELEMCOUNT(chunkmap); i++) {	\

	for (i = 0; i < ARRAY_SIZE(chunkmap); i++) {	\

		if (chunkmap[i]) {			\

			flag = 0;			\

			break;				\
@@ -94,7 +92,7 @@ struct ipt_sctp_info { 
({							\

	int i; 						\

	int flag = 1;					\

	for (i = 0; i < ELEMCOUNT(chunkmap); i++) {	\

	for (i = 0; i < ARRAY_SIZE(chunkmap); i++) {	\

		if (chunkmap[i] != ~0) {		\

			flag = 0;			\

				break;			\

include/linux/skbuff.h

+3 −4
Original line number Diff line number Diff line
@@ -206,6 +206,7 @@ enum { 
 *	@nfct: Associated connection, if any

 *	@ipvs_property: skbuff is owned by ipvs

 *	@nfctinfo: Relationship of this skb to the connection

 *	@nfct_reasm: netfilter conntrack re-assembly pointer

 *	@nf_bridge: Saved data about a bridged frame - see br_netfilter.c

 *	@tc_index: Traffic control index

 *	@tc_verd: traffic control verdict
@@ -264,16 +265,14 @@ struct sk_buff { 
				nohdr:1,

				nfctinfo:3;

	__u8			pkt_type:3,

				fclone:2;

				fclone:2,

				ipvs_property:1;

	__be16			protocol;



	void			(*destructor)(struct sk_buff *skb);

#ifdef CONFIG_NETFILTER

	__u32			nfmark;

	struct nf_conntrack	*nfct;

#if defined(CONFIG_IP_VS) || defined(CONFIG_IP_VS_MODULE)

	__u8			ipvs_property:1;

#endif

#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)

	struct sk_buff		*nfct_reasm;

#endif

include/net/ipv6.h

+2 −0
Original line number Diff line number Diff line
@@ -237,6 +237,8 @@ extern struct ipv6_txoptions * ipv6_renew_options(struct sock *sk, struct ipv6_t 
						   int newtype,

						   struct ipv6_opt_hdr __user *newopt,

						   int newoptlen);

struct ipv6_txoptions *ipv6_fixup_options(struct ipv6_txoptions *opt_space,

					  struct ipv6_txoptions *opt);



extern int ip6_frag_nqueues;

extern atomic_t ip6_frag_mem;