kernel: bump 3.18 to 3.18.135

[openwrt/openwrt.git] / target / linux / generic / pending-3.18 / 081-01-pppoe-Use-workqueue-to-die-properly-when-a-PADT-is-r.patch

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 347049a9243e61d2e3990e312fa69cad11fb2b90..fb44df97e9246c3c4892666d1d55b4e4f6285826 100644 (file)
--- 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 @@