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

Commit 137b529e 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:
  [XFRM] STATE: Fix to respond error to get operation if no matching entry exists.
  [NET]: Re-fix of doc-comment in sock.h
  [6PACK]: Masking bug in 6pack driver.
  [NET]: Fix kfifo_alloc() error check.
  [UDP]: Make udp_encap_rcv use pskb_may_pull
  [NETFILTER]: H.323 conntrack: fix crash with CONFIG_IP_NF_CT_ACCT
parents 221a09d5 9abbffee

drivers/net/hamradio/6pack.c

+1 −1
Original line number Diff line number Diff line
@@ -914,7 +914,7 @@ static void decode_prio_command(struct sixpack *sp, unsigned char cmd) 
					printk(KERN_DEBUG "6pack: protocol violation\n");

				else

					sp->status = 0;

				cmd &= !SIXP_RX_DCD_MASK;

				cmd &= ~SIXP_RX_DCD_MASK;

		}

		sp->status = cmd & SIXP_PRIO_DATA_MASK;

	} else { /* output watchdog char if idle */

include/net/sock.h

+10 −5
Original line number Diff line number Diff line
@@ -883,18 +883,23 @@ static inline int sk_filter(struct sock *sk, struct sk_buff *skb) 
}



/**

 *	sk_filter_release: Release a socket filter

 *	@rcu: rcu_head that contains the sk_filter info to remove

 *

 *	Remove a filter from a socket and release its resources.

 * 	sk_filter_rcu_free: Free a socket filter

 *	@rcu: rcu_head that contains the sk_filter to free

 */

 

static inline void sk_filter_rcu_free(struct rcu_head *rcu)

{

	struct sk_filter *fp = container_of(rcu, struct sk_filter, rcu);

	kfree(fp);

}



/**

 *	sk_filter_release: Release a socket filter

 *	@sk: socket

 *	@fp: filter to remove

 *

 *	Remove a filter from a socket and release its resources.

 */



static inline void sk_filter_release(struct sock *sk, struct sk_filter *fp)

{

	unsigned int size = sk_filter_len(fp);

net/dccp/probe.c

+2 −0
Original line number Diff line number Diff line
@@ -160,6 +160,8 @@ static __init int dccpprobe_init(void) 
	init_waitqueue_head(&dccpw.wait);

	spin_lock_init(&dccpw.lock);

	dccpw.fifo = kfifo_alloc(bufsize, GFP_KERNEL, &dccpw.lock);

	if (IS_ERR(dccpw.fifo))

		return PTR_ERR(dccpw.fifo);



	if (!proc_net_fops_create(procname, S_IRUSR, &dccpprobe_fops))

		goto err0;

net/ipv4/netfilter/ip_conntrack_helper_h323.c

+2 −2
Original line number Diff line number Diff line
@@ -1417,7 +1417,7 @@ static int process_rcf(struct sk_buff **pskb, struct ip_conntrack *ct, 
		DEBUGP

		    ("ip_ct_ras: set RAS connection timeout to %u seconds\n",

		     info->timeout);

		ip_ct_refresh_acct(ct, ctinfo, NULL, info->timeout * HZ);

		ip_ct_refresh(ct, *pskb, info->timeout * HZ);



		/* Set expect timeout */

		read_lock_bh(&ip_conntrack_lock);
@@ -1465,7 +1465,7 @@ static int process_urq(struct sk_buff **pskb, struct ip_conntrack *ct, 
	info->sig_port[!dir] = 0;



	/* Give it 30 seconds for UCF or URJ */

	ip_ct_refresh_acct(ct, ctinfo, NULL, 30 * HZ);

	ip_ct_refresh(ct, *pskb, 30 * HZ);



	return 0;

}

net/ipv4/tcp_probe.c

+2 −0
Original line number Diff line number Diff line
@@ -156,6 +156,8 @@ static __init int tcpprobe_init(void) 
	init_waitqueue_head(&tcpw.wait);

	spin_lock_init(&tcpw.lock);

	tcpw.fifo = kfifo_alloc(bufsize, GFP_KERNEL, &tcpw.lock);

	if (IS_ERR(tcpw.fifo))

		return PTR_ERR(tcpw.fifo);



	if (!proc_net_fops_create(procname, S_IRUSR, &tcpprobe_fops))

		goto err0;