diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2012-11-29 17:50:03 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2012-11-29 17:50:03 +0000 |
| commit | 69223c85bee385d0bcf057555291c43d58150462 (patch) | |
| tree | 50172b575fc79539f9aa84fd749e6da211d0e6f5 /target/linux/generic/patches-3.3/080-prot-release-cb.patch | |
| parent | 0ff0362f978766d1c54b591d0713fd9adf5c9c22 (diff) | |
| download | upstream-69223c85bee385d0bcf057555291c43d58150462.tar.gz upstream-69223c85bee385d0bcf057555291c43d58150462.tar.bz2 upstream-69223c85bee385d0bcf057555291c43d58150462.zip | |
AA: kernel: Add ATM fixes pending upstream merge (queue reduction, race fixes)
Backport of r34410.
Patches about to go into net-next.git
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@34413 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.3/080-prot-release-cb.patch')
| -rw-r--r-- | target/linux/generic/patches-3.3/080-prot-release-cb.patch | 27 |
1 files changed, 27 insertions, 0 deletions
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 0000000000..8af8a198f1 --- /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); |