aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-3.18/081-06-ppp-don-t-set-sk_state-to-PPPOX_ZOMBIE-in-pppoe_disc.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2019-03-25 15:29:06 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2019-05-03 22:41:38 +0200
commit1325e74e0c2f9ebdafe05b1492cec77a60059920 (patch)
treeaf21c4890a4ae5c08dc08ee7cabdc14a651f33ad /target/linux/generic/pending-3.18/081-06-ppp-don-t-set-sk_state-to-PPPOX_ZOMBIE-in-pppoe_disc.patch
parent675832de79ec14ddc1183a66d1084aff7a856289 (diff)
downloadupstream-1325e74e0c2f9ebdafe05b1492cec77a60059920.tar.gz
upstream-1325e74e0c2f9ebdafe05b1492cec77a60059920.tar.bz2
upstream-1325e74e0c2f9ebdafe05b1492cec77a60059920.zip
kernel: Remove support for kernel 3.18
No target is using kernel 3.18 anymore, remove all the generic support for kernel 3.18. The removed packages are depending on kernel 3.18 only and are not used on any recent kernel. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic/pending-3.18/081-06-ppp-don-t-set-sk_state-to-PPPOX_ZOMBIE-in-pppoe_disc.patch')
-rw-r--r--target/linux/generic/pending-3.18/081-06-ppp-don-t-set-sk_state-to-PPPOX_ZOMBIE-in-pppoe_disc.patch45
1 files changed, 0 insertions, 45 deletions
diff --git a/target/linux/generic/pending-3.18/081-06-ppp-don-t-set-sk_state-to-PPPOX_ZOMBIE-in-pppoe_disc.patch b/target/linux/generic/pending-3.18/081-06-ppp-don-t-set-sk_state-to-PPPOX_ZOMBIE-in-pppoe_disc.patch
deleted file mode 100644
index 8d155eba1d..0000000000
--- a/target/linux/generic/pending-3.18/081-06-ppp-don-t-set-sk_state-to-PPPOX_ZOMBIE-in-pppoe_disc.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From: Guillaume Nault <g.nault@alphalink.fr>
-Date: Thu, 19 Nov 2015 12:52:56 +0100
-Subject: [PATCH] ppp: don't set sk_state to PPPOX_ZOMBIE in pppoe_disc_rcv()
-
-Since 287f3a943fef ("pppoe: Use workqueue to die properly when a PADT
-is received"), pppoe_disc_rcv() disconnects the socket by scheduling
-pppoe_unbind_sock_work(). This is enough to stop socket transmission
-and makes the PPPOX_ZOMBIE state uncessary.
-
-Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
-
---- a/drivers/net/ppp/pppoe.c
-+++ b/drivers/net/ppp/pppoe.c
-@@ -500,27 +500,9 @@ static int pppoe_disc_rcv(struct sk_buff
-
- pn = pppoe_pernet(dev_net(dev));
- po = get_item(pn, ph->sid, eth_hdr(skb)->h_source, dev->ifindex);
-- if (po) {
-- struct sock *sk = sk_pppox(po);
--
-- bh_lock_sock(sk);
--
-- /* If the user has locked the socket, just ignore
-- * the packet. With the way two rcv protocols hook into
-- * one socket family type, we cannot (easily) distinguish
-- * what kind of SKB it is during backlog rcv.
-- */
-- if (sock_owned_by_user(sk) == 0) {
-- /* We're no longer connect at the PPPOE layer,
-- * and must wait for ppp channel to disconnect us.
-- */
-- sk->sk_state = PPPOX_ZOMBIE;
-- }
--
-- bh_unlock_sock(sk);
-+ if (po)
- if (!schedule_work(&po->proto.pppoe.padt_work))
-- sock_put(sk);
-- }
-+ sock_put(sk_pppox(po));
-
- abort:
- kfree_skb(skb);