aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.18/650-pppoe_header_pad.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2015-12-23 11:15:02 +0000
committerFelix Fietkau <nbd@openwrt.org>2015-12-23 11:15:02 +0000
commit1dfce2f506ac4e7e8900743577b73a5d6dfecf1c (patch)
tree14ba60948187beafe346ccd36f09710e1d0417d7 /target/linux/generic/patches-3.18/650-pppoe_header_pad.patch
parentd259c74f98fea265e3e5ebb24c76d3a3386251be (diff)
downloadmaster-187ad058-1dfce2f506ac4e7e8900743577b73a5d6dfecf1c.tar.gz
master-187ad058-1dfce2f506ac4e7e8900743577b73a5d6dfecf1c.tar.bz2
master-187ad058-1dfce2f506ac4e7e8900743577b73a5d6dfecf1c.zip
kernel: backport all current pppoe kernel fixes to 3.18
Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47963 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.18/650-pppoe_header_pad.patch')
-rw-r--r--target/linux/generic/patches-3.18/650-pppoe_header_pad.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-3.18/650-pppoe_header_pad.patch b/target/linux/generic/patches-3.18/650-pppoe_header_pad.patch
index 4b623fad29..eb9b4bfd15 100644
--- a/target/linux/generic/patches-3.18/650-pppoe_header_pad.patch
+++ b/target/linux/generic/patches-3.18/650-pppoe_header_pad.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/ppp/pppoe.c
+++ b/drivers/net/ppp/pppoe.c
-@@ -868,7 +868,7 @@ static int pppoe_sendmsg(struct kiocb *i
+@@ -859,7 +859,7 @@ static int pppoe_sendmsg(struct kiocb *i
goto end;
@@ -9,7 +9,7 @@
0, GFP_KERNEL);
if (!skb) {
error = -ENOMEM;
-@@ -876,7 +876,7 @@ static int pppoe_sendmsg(struct kiocb *i
+@@ -867,7 +867,7 @@ static int pppoe_sendmsg(struct kiocb *i
}
/* Reserve space for headers. */