diff options
author | Hauke Mehrtens <hauke@openwrt.org> | 2015-07-12 16:02:34 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@openwrt.org> | 2015-07-12 16:02:34 +0000 |
commit | 4e7d2ffce589a195c89e45b373717dbd0a00052e (patch) | |
tree | d1a6d5f02ec019759d6af4e293f127f1ec061533 /target/linux/ar71xx | |
parent | 51a243f3c112e6946575381ef5531fb1e51370e8 (diff) | |
download | upstream-4e7d2ffce589a195c89e45b373717dbd0a00052e.tar.gz upstream-4e7d2ffce589a195c89e45b373717dbd0a00052e.tar.bz2 upstream-4e7d2ffce589a195c89e45b373717dbd0a00052e.zip |
CC: kernel: update 3.18 to 3.18.18
Changelog:
* https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.18
Backport of r46299, r46303 and r46308.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46309 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar71xx')
-rw-r--r-- | target/linux/ar71xx/patches-3.18/902-unaligned_access_hacks.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/ar71xx/patches-3.18/902-unaligned_access_hacks.patch b/target/linux/ar71xx/patches-3.18/902-unaligned_access_hacks.patch index 7e22859343..6b6c0f2d3f 100644 --- a/target/linux/ar71xx/patches-3.18/902-unaligned_access_hacks.patch +++ b/target/linux/ar71xx/patches-3.18/902-unaligned_access_hacks.patch @@ -342,7 +342,7 @@ #endif /* _LINUX_TYPES_H */ --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c -@@ -1324,8 +1324,8 @@ static struct sk_buff **inet_gro_receive +@@ -1326,8 +1326,8 @@ static struct sk_buff **inet_gro_receive if (unlikely(ip_fast_csum((u8 *)iph, 5))) goto out_unlock; |