projects
/
openwrt
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel/3.18: update to version 3.18.25
[openwrt/openwrt.git]
/
target
/
linux
/
generic
/
patches-3.18
/
081-01-pppoe-Use-workqueue-to-die-properly-when-a-PADT-is-r.patch
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 de8583058f4065cb0f78249076ea4bca637cbb45..347049a9243e61d2e3990e312fa69cad11fb2b90 100644
(file)
--- 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
--- a/drivers/net/ppp/pppoe.c
+++ b/drivers/net/ppp/pppoe.c
-@@ -45
5,6 +455
,18 @@ out:
+@@ -45
4,6 +454
,18 @@ out:
return NET_RX_DROP;
}
return NET_RX_DROP;
}
@@
-50,7
+50,7
@@
Signed-off-by: David S. Miller <davem@davemloft.net>
/************************************************************************
*
* Receive a PPPoE Discovery frame.
/************************************************************************
*
* 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);
}
bh_unlock_sock(sk);
@@
-60,7
+60,7
@@
Signed-off-by: David S. Miller <davem@davemloft.net>
}
abort:
}
abort:
-@@ -61
3,6 +626
,8 @@ static int pppoe_connect(struct socket *
+@@ -61
2,6 +625
,8 @@ static int pppoe_connect(struct socket *
lock_sock(sk);
lock_sock(sk);