summaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.6/650-pppoe_header_pad.patch
diff options
context:
space:
mode:
authorflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-10-24 13:05:22 +0000
committerflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-10-24 13:05:22 +0000
commiteb0c0200624c487af549aca9eddb722413dbc1cd (patch)
treeb152afa6fd38537133c7a67e6aeff8476342d5a0 /target/linux/generic/patches-3.6/650-pppoe_header_pad.patch
parent8b3c85ca8244eec0d01eea269922d780f73ccebb (diff)
[kernel] make all 3.6 patches apply and build
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33911 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.6/650-pppoe_header_pad.patch')
-rw-r--r--target/linux/generic/patches-3.6/650-pppoe_header_pad.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-3.6/650-pppoe_header_pad.patch b/target/linux/generic/patches-3.6/650-pppoe_header_pad.patch
index 5862dc113..a89a9f3b7 100644
--- a/target/linux/generic/patches-3.6/650-pppoe_header_pad.patch
+++ b/target/linux/generic/patches-3.6/650-pppoe_header_pad.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/ppp/pppoe.c
+++ b/drivers/net/ppp/pppoe.c
-@@ -856,7 +856,7 @@ static int pppoe_sendmsg(struct kiocb *i
+@@ -850,7 +850,7 @@ static int pppoe_sendmsg(struct kiocb *i
goto end;
@@ -9,7 +9,7 @@
0, GFP_KERNEL);
if (!skb) {
error = -ENOMEM;
-@@ -864,7 +864,7 @@ static int pppoe_sendmsg(struct kiocb *i
+@@ -858,7 +858,7 @@ static int pppoe_sendmsg(struct kiocb *i
}
/* Reserve space for headers. */