summaryrefslogtreecommitdiffstats
path: root/target/linux/ar71xx
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2013-12-15 19:16:30 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2013-12-15 19:16:30 +0000
commit952db22551ae621deef18680625aaede453001f4 (patch)
tree3e70781509679af75aa1d73cc62d32b1f3a9ebb7 /target/linux/ar71xx
parentfd50416248add8012b0581fc3c28875c546c947b (diff)
downloadmaster-31e0f0ae-952db22551ae621deef18680625aaede453001f4.tar.gz
master-31e0f0ae-952db22551ae621deef18680625aaede453001f4.tar.bz2
master-31e0f0ae-952db22551ae621deef18680625aaede453001f4.zip
kernel: update kernel 3.10 to 3.10.24
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 39059
Diffstat (limited to 'target/linux/ar71xx')
-rw-r--r--target/linux/ar71xx/Makefile2
-rw-r--r--target/linux/ar71xx/patches-3.10/902-unaligned_access_hacks.patch2
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/ar71xx/Makefile b/target/linux/ar71xx/Makefile
index 5fddd6f3fc..c865a547be 100644
--- a/target/linux/ar71xx/Makefile
+++ b/target/linux/ar71xx/Makefile
@@ -13,7 +13,7 @@ FEATURES:=mips16
CPU_TYPE=34kc
SUBTARGETS:=generic nand mikrotik
-LINUX_VERSION:=3.10.21
+LINUX_VERSION:=3.10.24
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/ar71xx/patches-3.10/902-unaligned_access_hacks.patch b/target/linux/ar71xx/patches-3.10/902-unaligned_access_hacks.patch
index 1807dfb2ed..a0b5824850 100644
--- a/target/linux/ar71xx/patches-3.10/902-unaligned_access_hacks.patch
+++ b/target/linux/ar71xx/patches-3.10/902-unaligned_access_hacks.patch
@@ -265,7 +265,7 @@
&sin->sin6_addr);
sin->sin6_scope_id = 0;
}
-@@ -687,12 +687,12 @@ int ip6_datagram_send_ctl(struct net *ne
+@@ -691,12 +691,12 @@ int ip6_datagram_send_ctl(struct net *ne
}
if (fl6->flowlabel&IPV6_FLOWINFO_MASK) {