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

Commit e1d7e7fc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [TCP]: DSACK signals data receival, be conservative
  [TCP]: Also handle snd_una changes in tcp_cwnd_down
  [TIPC]: Fix two minor sparse warnings.
  [TIPC]: Make function tipc_nameseq_subscribe static.
  [PF_KEY]: Fix ipsec not working in 2.6.23-rc1-git10
  [TCP]: Invoke tcp_sendmsg() directly, do not use inet_sendmsg().
  [IPV4] route.c: mostly kmalloc + memset conversion to k[cz]alloc
  [IPV4] raw.c: kmalloc + memset conversion to kzalloc
  [NETFILTER] nf_conntrack_l3proto_ipv4_compat.c: kmalloc + memset conversion to kzalloc
  [NETFILTER] nf_conntrack_expect.c: kmalloc + memset conversion to kzalloc
  [NET]: Removal of duplicated include net/wanrouter/wanmain.c
  SCTP: remove useless code in function sctp_init_cause
  SCTP: drop SACK if ctsn is not less than the next tsn of assoc
  SCTP: IPv4 mapped addr not returned in SCTPv6 accept()
  SCTP: IPv4 mapped addr not returned in SCTPv6 accept()
  sctp: fix shadow symbol in net/sctp/tsnmap.c
  sctp: try to fix readlock
  sctp: remove shadowed symbols
  sctp: move global declaration to header file.
  sctp: make locally used function static
parents 3ff42e4f 49ff4bb4

include/net/sctp/sctp.h

+10 −0
Original line number Diff line number Diff line
@@ -189,6 +189,16 @@ int sctp_assocs_proc_init(void); 
void sctp_assocs_proc_exit(void);





/*

 * Module global variables

 */



 /*

  * sctp/protocol.c

  */

extern struct kmem_cache *sctp_chunk_cachep __read_mostly;

extern struct kmem_cache *sctp_bucket_cachep __read_mostly;



/*

 *  Section:  Macros, externs, and inlines

 */

include/net/tcp.h

+1 −1
Original line number Diff line number Diff line
@@ -281,7 +281,7 @@ extern int tcp_v4_remember_stamp(struct sock *sk); 


extern int		    	tcp_v4_tw_remember_stamp(struct inet_timewait_sock *tw);



extern int			tcp_sendmsg(struct kiocb *iocb, struct sock *sk,

extern int			tcp_sendmsg(struct kiocb *iocb, struct socket *sock,

					    struct msghdr *msg, size_t size);

extern ssize_t			tcp_sendpage(struct socket *sock, struct page *page, int offset, size_t size, int flags);

net/ipv4/af_inet.c

+1 −1
Original line number Diff line number Diff line
@@ -831,7 +831,7 @@ const struct proto_ops inet_stream_ops = { 
	.shutdown	   = inet_shutdown,

	.setsockopt	   = sock_common_setsockopt,

	.getsockopt	   = sock_common_getsockopt,

	.sendmsg	   = inet_sendmsg,

	.sendmsg	   = tcp_sendmsg,

	.recvmsg	   = sock_common_recvmsg,

	.mmap		   = sock_no_mmap,

	.sendpage	   = tcp_sendpage,

net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c

+2 −3
Original line number Diff line number Diff line
@@ -294,15 +294,14 @@ static int exp_open(struct inode *inode, struct file *file) 
	struct ct_expect_iter_state *st;

	int ret;



	st = kmalloc(sizeof(struct ct_expect_iter_state), GFP_KERNEL);

	if (st == NULL)

	st = kzalloc(sizeof(struct ct_expect_iter_state), GFP_KERNEL);

	if (!st)

		return -ENOMEM;

	ret = seq_open(file, &exp_seq_ops);

	if (ret)

		goto out_free;

	seq          = file->private_data;

	seq->private = st;

	memset(st, 0, sizeof(struct ct_expect_iter_state));

	return ret;

out_free:

	kfree(st);

net/ipv4/raw.c

+2 −2
Original line number Diff line number Diff line
@@ -900,8 +900,9 @@ static int raw_seq_open(struct inode *inode, struct file *file) 
{

	struct seq_file *seq;

	int rc = -ENOMEM;

	struct raw_iter_state *s = kmalloc(sizeof(*s), GFP_KERNEL);

	struct raw_iter_state *s;



	s = kzalloc(sizeof(*s), GFP_KERNEL);

	if (!s)

		goto out;

	rc = seq_open(file, &raw_seq_ops);
@@ -910,7 +911,6 @@ static int raw_seq_open(struct inode *inode, struct file *file) 


	seq = file->private_data;

	seq->private = s;

	memset(s, 0, sizeof(*s));

out:

	return rc;

out_kfree: