aboutsummaryrefslogtreecommitdiffstats
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
commitdc562c4e6c274ea22db8a11fdfe7ddfe75859e36 (patch)
tree4648f29bfc71407aaf187289bb0213ecc000a966 /target/linux/generic/patches-4.0/650-pppoe_header_pad.patch
parent94a2f9fedebfd48166970d9cd03430129974b949 (diff)
downloadmaster-187ad058-dc562c4e6c274ea22db8a11fdfe7ddfe75859e36.tar.gz
master-187ad058-dc562c4e6c274ea22db8a11fdfe7ddfe75859e36.tar.bz2
master-187ad058-dc562c4e6c274ea22db8a11fdfe7ddfe75859e36.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> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45761 3c298f89-4303-0410-b956-a3cf2f4a3e73
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. */