projects
/
oweals
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: update 4.9 to 4.9.49
[oweals/openwrt.git]
/
target
/
linux
/
generic
/
pending-4.9
/
650-pppoe_header_pad.patch
diff --git
a/target/linux/generic/pending-4.9/650-pppoe_header_pad.patch
b/target/linux/generic/pending-4.9/650-pppoe_header_pad.patch
index 65fded0ba43599bc8d9bd1c7377607c48f46371e..3115073b508fee091ee0193c39f57ffdb29e1b4d 100644
(file)
--- a/
target/linux/generic/pending-4.9/650-pppoe_header_pad.patch
+++ b/
target/linux/generic/pending-4.9/650-pppoe_header_pad.patch
@@
-7,11
+7,9
@@
Signed-off-by: Felix Fietkau <nbd@nbd.name>
drivers/net/ppp/pppoe.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ppp/pppoe.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
-diff --git a/drivers/net/ppp/pppoe.c b/drivers/net/ppp/pppoe.c
-index 4ddae8118c85..49ef11f92fc9 100644
--- a/drivers/net/ppp/pppoe.c
+++ b/drivers/net/ppp/pppoe.c
--- a/drivers/net/ppp/pppoe.c
+++ b/drivers/net/ppp/pppoe.c
-@@ -861,7 +861,7 @@ static int pppoe_sendmsg(struct socket *
sock, struct msghdr *m,
+@@ -861,7 +861,7 @@ static int pppoe_sendmsg(struct socket *
goto end;
goto end;
@@
-20,7
+18,7
@@
index 4ddae8118c85..49ef11f92fc9 100644
0, GFP_KERNEL);
if (!skb) {
error = -ENOMEM;
0, GFP_KERNEL);
if (!skb) {
error = -ENOMEM;
-@@ -869,7 +869,7 @@ static int pppoe_sendmsg(struct socket *
sock, struct msghdr *m,
+@@ -869,7 +869,7 @@ static int pppoe_sendmsg(struct socket *
}
/* Reserve space for headers. */
}
/* Reserve space for headers. */
@@
-29,6
+27,3
@@
index 4ddae8118c85..49ef11f92fc9 100644
skb_reset_network_header(skb);
skb->dev = dev;
skb_reset_network_header(skb);
skb->dev = dev;
---
-2.11.0
-