diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2016-01-12 20:53:04 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2016-01-12 20:53:04 +0000 |
| commit | de18003b6e759e1f5309cd3f00d63f6b447f5fe1 (patch) | |
| tree | 3221367a6827f83a068a290cd876b19b4c88454f /target/linux/generic/patches-3.18/081-01-pppoe-Use-workqueue-to-die-properly-when-a-PADT-is-r.patch | |
| parent | cdb83aaf5fe8de98b909d6655d6c7b9d8d2aadb2 (diff) | |
| download | upstream-de18003b6e759e1f5309cd3f00d63f6b447f5fe1.tar.gz upstream-de18003b6e759e1f5309cd3f00d63f6b447f5fe1.tar.bz2 upstream-de18003b6e759e1f5309cd3f00d63f6b447f5fe1.zip | |
kernel/3.18: update to version 3.18.25
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 48225
Diffstat (limited to 'target/linux/generic/patches-3.18/081-01-pppoe-Use-workqueue-to-die-properly-when-a-PADT-is-r.patch')
| -rw-r--r-- | target/linux/generic/patches-3.18/081-01-pppoe-Use-workqueue-to-die-properly-when-a-PADT-is-r.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-3.18/081-01-pppoe-Use-workqueue-to-die-properly-when-a-PADT-is-r.patch b/target/linux/generic/patches-3.18/081-01-pppoe-Use-workqueue-to-die-properly-when-a-PADT-is-r.patch index de8583058f..347049a924 100644 --- a/target/linux/generic/patches-3.18/081-01-pppoe-Use-workqueue-to-die-properly-when-a-PADT-is-r.patch +++ b/target/linux/generic/patches-3.18/081-01-pppoe-Use-workqueue-to-die-properly-when-a-PADT-is-r.patch @@ -31,7 +31,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> --- a/drivers/net/ppp/pppoe.c +++ b/drivers/net/ppp/pppoe.c -@@ -455,6 +455,18 @@ out: +@@ -454,6 +454,18 @@ out: return NET_RX_DROP; } @@ -50,7 +50,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> /************************************************************************ * * Receive a PPPoE Discovery frame. -@@ -500,7 +512,8 @@ static int pppoe_disc_rcv(struct sk_buff +@@ -499,7 +511,8 @@ static int pppoe_disc_rcv(struct sk_buff } bh_unlock_sock(sk); @@ -60,7 +60,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> } abort: -@@ -613,6 +626,8 @@ static int pppoe_connect(struct socket * +@@ -612,6 +625,8 @@ static int pppoe_connect(struct socket * lock_sock(sk); |