diff options
author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-08-20 10:43:09 +0200 |
---|---|---|
committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-08-20 13:03:23 +0200 |
commit | 548182bc6d38a3817c8e9f5b11207043a31c59b9 (patch) | |
tree | 47925b7011e6f85ccac7ce7eb6fae55423778248 /target/linux/generic/pending-3.18/081-01-pppoe-Use-workqueue-to-die-properly-when-a-PADT-is-r.patch | |
parent | 1f7ce19df292dfe3c270091ac0f7edc5bb9a8324 (diff) | |
download | upstream-548182bc6d38a3817c8e9f5b11207043a31c59b9.tar.gz upstream-548182bc6d38a3817c8e9f5b11207043a31c59b9.tar.bz2 upstream-548182bc6d38a3817c8e9f5b11207043a31c59b9.zip |
kernel: bump 3.18 to 3.18.119
Refreshed all patches.
Compile-tested on: adm5120, adm8668, au1000, mcs814x, ppc40x, ppc44x, xburst
Runtime-tested on: none
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/pending-3.18/081-01-pppoe-Use-workqueue-to-die-properly-when-a-PADT-is-r.patch')
-rw-r--r-- | target/linux/generic/pending-3.18/081-01-pppoe-Use-workqueue-to-die-properly-when-a-PADT-is-r.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/pending-3.18/081-01-pppoe-Use-workqueue-to-die-properly-when-a-PADT-is-r.patch b/target/linux/generic/pending-3.18/081-01-pppoe-Use-workqueue-to-die-properly-when-a-PADT-is-r.patch index 347049a924..fb44df97e9 100644 --- a/target/linux/generic/pending-3.18/081-01-pppoe-Use-workqueue-to-die-properly-when-a-PADT-is-r.patch +++ b/target/linux/generic/pending-3.18/081-01-pppoe-Use-workqueue-to-die-properly-when-a-PADT-is-r.patch @@ -67,8 +67,8 @@ Signed-off-by: David S. Miller <davem@davemloft.net> + INIT_WORK(&po->proto.pppoe.padt_work, pppoe_unbind_sock_work); + error = -EINVAL; - if (sp->sa_protocol != PX_PROTO_OE) - goto end; + + if (sockaddr_len != sizeof(struct sockaddr_pppox)) --- a/include/linux/if_pppox.h +++ b/include/linux/if_pppox.h @@ -19,6 +19,7 @@ |