Skip to content

Commit

Permalink
CC: kernel: update kernel 3.18 to version 3.18.27
Browse files Browse the repository at this point in the history
Changelog:
* https://cdn.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.24
* https://cdn.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.25
* https://cdn.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.26
* https://cdn.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.27

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>


git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48896 3c298f89-4303-0410-b956-a3cf2f4a3e73
  • Loading branch information
hauke committed Mar 3, 2016
1 parent df52076 commit 0d72668
Show file tree
Hide file tree
Showing 39 changed files with 132 additions and 311 deletions.
4 changes: 2 additions & 2 deletions include/kernel-version.mk
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

LINUX_RELEASE?=1

LINUX_VERSION-3.18 = .23
LINUX_VERSION-3.18 = .27

LINUX_KERNEL_MD5SUM-3.18.23 = dc6d265ab38716be3676ac294b481ad8
LINUX_KERNEL_MD5SUM-3.18.27 = 015a01bf84e7c6bc9952551b4da45044

ifdef KERNEL_PATCHVER
LINUX_VERSION:=$(KERNEL_PATCHVER)$(strip $(LINUX_VERSION-$(KERNEL_PATCHVER)))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1351,7 +1351,7 @@

config ATH79_MACH_UBNT_XM
bool "Ubiquiti Networks XM/UniFi boards"
@@ -83,6 +1126,106 @@ config ATH79_MACH_UBNT_XM
@@ -83,6 +1135,106 @@ config ATH79_MACH_UBNT_XM
Say 'Y' here if you want your kernel to support the
Ubiquiti Networks XM (rev 1.0) board.

Expand Down Expand Up @@ -1458,7 +1458,7 @@
endmenu

config SOC_AR71XX
@@ -124,7 +1267,10 @@ config ATH79_DEV_DSA
@@ -124,7 +1276,10 @@ config ATH79_DEV_DSA
config ATH79_DEV_ETH
def_bool n

Expand All @@ -1470,7 +1470,7 @@
def_bool n

config ATH79_DEV_GPIO_BUTTONS
@@ -154,6 +1300,11 @@ config ATH79_PCI_ATH9K_FIXUP
@@ -154,6 +1309,11 @@ config ATH79_PCI_ATH9K_FIXUP
def_bool n

config ATH79_ROUTERBOOT
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ meaning of the bits CPUCLK_FROM_CPUPLL and DDRCLK_FROM_DDRPLL is reversed.

--- a/arch/mips/ath79/Kconfig
+++ b/arch/mips/ath79/Kconfig
@@ -1248,6 +1248,10 @@ config SOC_AR934X
@@ -1257,6 +1257,10 @@ config SOC_AR934X
select PCI_AR724X if PCI
def_bool n

Expand All @@ -33,7 +33,7 @@ meaning of the bits CPUCLK_FROM_CPUPLL and DDRCLK_FROM_DDRPLL is reversed.
config SOC_QCA955X
select HW_HAS_PCI
select PCI_AR724X if PCI
@@ -1290,7 +1294,7 @@ config ATH79_DEV_USB
@@ -1299,7 +1303,7 @@ config ATH79_DEV_USB
def_bool n

config ATH79_DEV_WMAC
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@
}
--- a/arch/mips/ath79/Kconfig
+++ b/arch/mips/ath79/Kconfig
@@ -1268,6 +1268,12 @@ config SOC_QCA955X
@@ -1277,6 +1277,12 @@ config SOC_QCA955X
select PCI_AR724X if PCI
def_bool n

Expand All @@ -391,7 +391,7 @@
config ATH79_DEV_M25P80
select ATH79_DEV_SPI
def_bool n
@@ -1305,7 +1311,7 @@ config ATH79_DEV_USB
@@ -1314,7 +1320,7 @@ config ATH79_DEV_USB
def_bool n

config ATH79_DEV_WMAC
Expand Down
33 changes: 19 additions & 14 deletions target/linux/ar71xx/patches-3.18/902-unaligned_access_hacks.patch
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@
#include <linux/uaccess.h>
#include <linux/ipv6.h>
#include <linux/icmpv6.h>
@@ -833,10 +834,10 @@ static void tcp_v6_send_response(struct
@@ -837,10 +838,10 @@ static void tcp_v6_send_response(struct
topt = (__be32 *)(t1 + 1);

if (tsecr) {
Expand All @@ -237,7 +237,7 @@
*/
--- a/net/ipv6/datagram.c
+++ b/net/ipv6/datagram.c
@@ -384,7 +384,7 @@ int ipv6_recv_error(struct sock *sk, str
@@ -386,7 +386,7 @@ int ipv6_recv_error(struct sock *sk, str
ipv6_iface_scope_id(&sin->sin6_addr,
IP6CB(skb)->iif);
} else {
Expand All @@ -246,7 +246,7 @@
&sin->sin6_addr);
sin->sin6_scope_id = 0;
}
@@ -718,12 +718,12 @@ int ip6_datagram_send_ctl(struct net *ne
@@ -720,12 +720,12 @@ int ip6_datagram_send_ctl(struct net *ne
}

if (fl6->flowlabel&IPV6_FLOWINFO_MASK) {
Expand Down Expand Up @@ -342,7 +342,7 @@
#endif /* _LINUX_TYPES_H */
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -1326,8 +1326,8 @@ static struct sk_buff **inet_gro_receive
@@ -1329,8 +1329,8 @@ static struct sk_buff **inet_gro_receive
if (unlikely(ip_fast_csum((u8 *)iph, 5)))
goto out_unlock;

Expand Down Expand Up @@ -637,14 +637,19 @@
#include <linux/netdevice.h>
--- a/include/net/inet_ecn.h
+++ b/include/net/inet_ecn.h
@@ -115,13 +115,13 @@ static inline int IP6_ECN_set_ce(struct
{
@@ -124,9 +124,9 @@ static inline int IP6_ECN_set_ce(struct
if (INET_ECN_is_not_ect(ipv6_get_dsfield(iph)))
return 0;
- *(__be32*)iph |= htonl(INET_ECN_CE << 20);
+ net_hdr_word(iph) |= htonl(INET_ECN_CE << 20);

- from = *(__be32 *)iph;
+ from = net_hdr_word(iph);
to = from | htonl(INET_ECN_CE << 20);
- *(__be32 *)iph = to;
+ net_hdr_word(iph) = to;
if (skb->ip_summed == CHECKSUM_COMPLETE)
skb->csum = csum_add(csum_sub(skb->csum, from), to);
return 1;
}
@@ -134,7 +134,7 @@ static inline int IP6_ECN_set_ce(struct

static inline void IP6_ECN_clear(struct ipv6hdr *iph)
{
Expand All @@ -664,7 +669,7 @@

#define IP6_MF 0x0001
#define IP6_OFFSET 0xFFF8
@@ -398,8 +398,8 @@ static inline void __ipv6_addr_set_half(
@@ -417,8 +417,8 @@ static inline void __ipv6_addr_set_half(
}
#endif
#endif
Expand All @@ -675,7 +680,7 @@
}

static inline void ipv6_addr_set(struct in6_addr *addr,
@@ -458,6 +458,8 @@ static inline bool ipv6_prefix_equal(con
@@ -477,6 +477,8 @@ static inline bool ipv6_prefix_equal(con
const __be32 *a1 = addr1->s6_addr32;
const __be32 *a2 = addr2->s6_addr32;
unsigned int pdw, pbi;
Expand All @@ -684,7 +689,7 @@

/* check complete u32 in prefix */
pdw = prefixlen >> 5;
@@ -466,7 +468,9 @@ static inline bool ipv6_prefix_equal(con
@@ -485,7 +487,9 @@ static inline bool ipv6_prefix_equal(con

/* check incomplete u32 in prefix */
pbi = prefixlen & 0x1f;
Expand All @@ -695,7 +700,7 @@
return false;

return true;
@@ -609,13 +613,13 @@ static inline void ipv6_addr_set_v4mappe
@@ -629,13 +633,13 @@ static inline void ipv6_addr_set_v4mappe
*/
static inline int __ipv6_addr_diff32(const void *token1, const void *token2, int addrlen)
{
Expand All @@ -711,7 +716,7 @@
if (xb)
return i * 32 + 31 - __fls(ntohl(xb));
}
@@ -739,17 +743,18 @@ static inline __be32 ip6_make_flowlabel(
@@ -759,17 +763,18 @@ static inline __be32 ip6_make_flowlabel(
static inline void ip6_flow_hdr(struct ipv6hdr *hdr, unsigned int tclass,
__be32 flowlabel)
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/arch/mips/ath79/machtypes.h
+++ b/arch/mips/ath79/machtypes.h
@@ -177,6 +177,7 @@ enum ath79_mach_type {
@@ -178,6 +178,7 @@ enum ath79_mach_type {
ATH79_MACH_UBNT_NANO_M, /* Ubiquiti NanoStation M */
ATH79_MACH_UBNT_NANO_M_XW, /* Ubiquiti NanoStation M XW */
ATH79_MACH_UBNT_ROCKET_M, /* Ubiquiti Rocket M */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
arch/arm/boot/dts/bcm4709-netgear-r8000.dts | 30 +++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)

diff --git a/arch/arm/boot/dts/bcm4709-netgear-r8000.dts b/arch/arm/boot/dts/bcm4709-netgear-r8000.dts
index 446c586..b52927c 100644
--- a/arch/arm/boot/dts/bcm4709-netgear-r8000.dts
+++ b/arch/arm/boot/dts/bcm4709-netgear-r8000.dts
@@ -50,6 +50,36 @@
Expand Down Expand Up @@ -52,6 +50,3 @@ index 446c586..b52927c 100644
};

gpio-keys {
--
1.8.4.5

Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
drivers/usb/host/bcma-hcd.c | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/drivers/usb/host/bcma-hcd.c b/drivers/usb/host/bcma-hcd.c
index 5398e3d..291aaa2 100644
--- a/drivers/usb/host/bcma-hcd.c
+++ b/drivers/usb/host/bcma-hcd.c
@@ -21,6 +21,7 @@
Expand All @@ -37,7 +35,7 @@ index 5398e3d..291aaa2 100644
};

/* Wait for bitmask in a register to get set or cleared.
@@ -228,19 +230,12 @@ static void bcma_hcd_init_chip_arm(struct bcma_device *dev)
@@ -228,19 +230,12 @@ static void bcma_hcd_init_chip_arm(struc

static void bcma_hci_platform_power_gpio(struct bcma_device *dev, bool val)
{
Expand All @@ -60,7 +58,7 @@ index 5398e3d..291aaa2 100644
}

static const struct usb_ehci_pdata ehci_pdata = {
@@ -314,7 +309,11 @@ static int bcma_hcd_probe(struct bcma_device *dev)
@@ -314,7 +309,11 @@ static int bcma_hcd_probe(struct bcma_de
if (!usb_dev)
return -ENOMEM;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ Subject: [PATCH 024/114] config: Enable CONFIG_MEMCG, but leave it disabled
printk("cgroup: using legacy files on the default hierarchy\n");
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -6207,6 +6207,7 @@ struct cgroup_subsys memory_cgrp_subsys
@@ -6208,6 +6208,7 @@ struct cgroup_subsys memory_cgrp_subsys
.bind = mem_cgroup_bind,
.legacy_cftypes = mem_cgroup_files,
.early_init = 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Hub overcurrent messages are more serious than "debug". Increase loglevel.

--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -4907,7 +4907,7 @@ static void port_event(struct usb_hub *h
@@ -4928,7 +4928,7 @@ static void port_event(struct usb_hub *h
if (portchange & USB_PORT_STAT_C_OVERCURRENT) {
u16 status = 0, unused;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
--- a/drivers/mtd/bcm47xxpart.c
+++ b/drivers/mtd/bcm47xxpart.c
@@ -100,6 +100,7 @@ static int bcm47xxpart_parse(struct mtd_
@@ -127,6 +127,7 @@ static int bcm47xxpart_parse(struct mtd_
int last_trx_part = -1;
int possible_nvram_sizes[] = { 0x8000, 0xF000, 0x10000, };
int err;
+ bool found_nvram = false;

/*
* Some really old flashes (like AT45DB*) had smaller erasesize-s, but
@@ -306,12 +307,23 @@ static int bcm47xxpart_parse(struct mtd_
@@ -334,12 +335,23 @@ static int bcm47xxpart_parse(struct mtd_
if (buf[0] == NVRAM_HEADER) {
bcm47xxpart_add_part(&parts[curr_part++], "nvram",
master->size - blocksize, 0);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>

static struct resource bcma_sflash_resource = {
.name = "bcma_sflash",
@@ -41,6 +42,13 @@ static const struct bcma_sflash_tbl_e bc
@@ -42,6 +43,13 @@ static const struct bcma_sflash_tbl_e bc
{ NULL },
};

Expand All @@ -35,7 +35,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
static const struct bcma_sflash_tbl_e bcma_sflash_sst_tbl[] = {
{ "SST25WF512", 1, 0x1000, 16, },
{ "SST25VF512", 0x48, 0x1000, 16, },
@@ -84,6 +92,24 @@ static void bcma_sflash_cmd(struct bcma_
@@ -85,6 +93,24 @@ static void bcma_sflash_cmd(struct bcma_
bcma_err(cc->core->bus, "SFLASH control command failed (timeout)!\n");
}

Expand All @@ -60,7 +60,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
/* Initialize serial flash access */
int bcma_sflash_init(struct bcma_drv_cc *cc)
{
@@ -114,6 +140,10 @@ int bcma_sflash_init(struct bcma_drv_cc
@@ -115,6 +141,10 @@ int bcma_sflash_init(struct bcma_drv_cc
case 0x13:
return -ENOTSUPP;
default:
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>

--- a/drivers/net/ppp/pppoe.c
+++ b/drivers/net/ppp/pppoe.c
@@ -455,6 +455,18 @@ out:
@@ -454,6 +454,18 @@ out:
return NET_RX_DROP;
}

Expand All @@ -50,7 +50,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
/************************************************************************
*
* Receive a PPPoE Discovery frame.
@@ -500,7 +512,8 @@ static int pppoe_disc_rcv(struct sk_buff
@@ -499,7 +511,8 @@ static int pppoe_disc_rcv(struct sk_buff
}

bh_unlock_sock(sk);
Expand All @@ -60,7 +60,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
}

abort:
@@ -613,6 +626,8 @@ static int pppoe_connect(struct socket *
@@ -612,6 +625,8 @@ static int pppoe_connect(struct socket *

lock_sock(sk);

Expand Down
Loading

0 comments on commit 0d72668

Please sign in to comment.