summaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-4.0/650-pppoe_header_pad.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2015-05-26 09:31:16 +0000
committerImre Kaloz <kaloz@openwrt.org>2015-05-26 09:31:16 +0000
commit588acc2cbae61c31b6eabd19e55fcb48c653d87a (patch)
treef26bf8a48afd178778540f4d077b203b902cb3e1 /target/linux/generic/patches-4.0/650-pppoe_header_pad.patch
parentdf23709f165b2e74e398080f1c0706d011263412 (diff)
downloadmaster-31e0f0ae-588acc2cbae61c31b6eabd19e55fcb48c653d87a.tar.gz
master-31e0f0ae-588acc2cbae61c31b6eabd19e55fcb48c653d87a.tar.bz2
master-31e0f0ae-588acc2cbae61c31b6eabd19e55fcb48c653d87a.zip
generic/4.0: update to 4.0.4
Update kernel sources and refresh some patches. Signed-off-by: Daniel Golle <daniel@makrotopia.org> Signed-off-by: Imre Kaloz <kaloz@openwrt.org> SVN-Revision: 45761
Diffstat (limited to 'target/linux/generic/patches-4.0/650-pppoe_header_pad.patch')
-rw-r--r--target/linux/generic/patches-4.0/650-pppoe_header_pad.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-4.0/650-pppoe_header_pad.patch b/target/linux/generic/patches-4.0/650-pppoe_header_pad.patch
index a89a9f3b74..3b4978be84 100644
--- a/target/linux/generic/patches-4.0/650-pppoe_header_pad.patch
+++ b/target/linux/generic/patches-4.0/650-pppoe_header_pad.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/ppp/pppoe.c
+++ b/drivers/net/ppp/pppoe.c
-@@ -850,7 +850,7 @@ static int pppoe_sendmsg(struct kiocb *i
+@@ -869,7 +869,7 @@ static int pppoe_sendmsg(struct kiocb *i
goto end;
@@ -9,7 +9,7 @@
0, GFP_KERNEL);
if (!skb) {
error = -ENOMEM;
-@@ -858,7 +858,7 @@ static int pppoe_sendmsg(struct kiocb *i
+@@ -877,7 +877,7 @@ static int pppoe_sendmsg(struct kiocb *i
}
/* Reserve space for headers. */