From a9a63643c40ea06f8923bcecda8ade2ec04a7988 Mon Sep 17 00:00:00 2001 From: juhosg Date: Thu, 29 Nov 2012 17:37:18 +0000 Subject: kernel: Add ATM fixes pending upstream merge (queue reduction, race fixes) Patches about to go into net-next.git Signed-off-by: David Woodhouse Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34410 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../generic/patches-3.3/080-prot-release-cb.patch | 27 ++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 target/linux/generic/patches-3.3/080-prot-release-cb.patch (limited to 'target/linux/generic/patches-3.3/080-prot-release-cb.patch') diff --git a/target/linux/generic/patches-3.3/080-prot-release-cb.patch b/target/linux/generic/patches-3.3/080-prot-release-cb.patch new file mode 100644 index 000000000..8af8a198f --- /dev/null +++ b/target/linux/generic/patches-3.3/080-prot-release-cb.patch @@ -0,0 +1,27 @@ +This was added in commit 46d3ceabd8d98ed0ad10f20c595ca784e34786c5 (tcp: +TCP Small Queues) but we need it for pppoatm too. + +--- a/include/net/sock.h ++++ b/include/net/sock.h +@@ -858,6 +858,8 @@ struct proto { + int (*backlog_rcv) (struct sock *sk, + struct sk_buff *skb); + ++ void (*release_cb)(struct sock *sk); ++ + /* Keeping track of sk's, looking them up, and port selection methods. */ + void (*hash)(struct sock *sk); + void (*unhash)(struct sock *sk); +--- a/net/core/sock.c ++++ b/net/core/sock.c +@@ -2159,6 +2159,10 @@ void release_sock(struct sock *sk) + spin_lock_bh(&sk->sk_lock.slock); + if (sk->sk_backlog.tail) + __release_sock(sk); ++ ++ if (sk->sk_prot->release_cb) ++ sk->sk_prot->release_cb(sk); ++ + sk->sk_lock.owned = 0; + if (waitqueue_active(&sk->sk_lock.wq)) + wake_up(&sk->sk_lock.wq); -- cgit v1.2.3