forked from coolsnowwolf/lede
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
daac324
commit 519d118
Showing
45 changed files
with
544 additions
and
614 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
36 changes: 0 additions & 36 deletions
36
...linux/generic/backport-4.9/023-2-smsc75xx-use-skb_cow_head-to-deal-with-cloned-skbs.patch
This file was deleted.
Oops, something went wrong.
35 changes: 0 additions & 35 deletions
35
...nux/generic/backport-4.9/023-3-cx82310_eth-use-skb_cow_head-to-deal-with-cloned-skb.patch
This file was deleted.
Oops, something went wrong.
37 changes: 0 additions & 37 deletions
37
...t/linux/generic/backport-4.9/023-4-sr9700-use-skb_cow_head-to-deal-with-cloned-skbs.patch
This file was deleted.
Oops, something went wrong.
38 changes: 0 additions & 38 deletions
38
.../linux/generic/backport-4.9/023-5-lan78xx-use-skb_cow_head-to-deal-with-cloned-skbs.patch
This file was deleted.
Oops, something went wrong.
34 changes: 34 additions & 0 deletions
34
target/linux/generic/backport-4.9/067-v4.11-mtd-nand-Add-Winbond-manufacturer-id.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
From a4077ce5871304f8a78f80b74b18b6052a410f1a Mon Sep 17 00:00:00 2001 | ||
From: "Andrey Jr. Melnikov" <[email protected]> | ||
Date: Thu, 8 Dec 2016 19:57:08 +0300 | ||
Subject: [PATCH] mtd: nand: Add Winbond manufacturer id | ||
|
||
Add WINBOND manufacturer id. | ||
|
||
Signed-off-by: Andrey Jr. Melnikov <[email protected]> | ||
Signed-off-by: Boris Brezillon <[email protected]> | ||
--- | ||
drivers/mtd/nand/nand_ids.c | 1 + | ||
include/linux/mtd/nand.h | 1 + | ||
2 files changed, 2 insertions(+) | ||
|
||
--- a/drivers/mtd/nand/nand_ids.c | ||
+++ b/drivers/mtd/nand/nand_ids.c | ||
@@ -182,6 +182,7 @@ struct nand_manufacturers nand_manuf_ids | ||
{NAND_MFR_SANDISK, "SanDisk"}, | ||
{NAND_MFR_INTEL, "Intel"}, | ||
{NAND_MFR_ATO, "ATO"}, | ||
+ {NAND_MFR_WINBOND, "Winbond"}, | ||
{0x0, "Unknown"} | ||
}; | ||
|
||
--- a/include/linux/mtd/nand.h | ||
+++ b/include/linux/mtd/nand.h | ||
@@ -928,6 +928,7 @@ static inline void nand_set_controller_d | ||
#define NAND_MFR_SANDISK 0x45 | ||
#define NAND_MFR_INTEL 0x89 | ||
#define NAND_MFR_ATO 0x9b | ||
+#define NAND_MFR_WINBOND 0xef | ||
|
||
/* The maximum expected count of bytes in the NAND ID sequence */ | ||
#define NAND_MAX_ID_LEN 8 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1095,7 +1095,7 @@ Signed-off-by: David S. Miller <[email protected]> | |
dma_intr_ena = smsc9420_reg_read(pd, DMAC_INTR_ENA); | ||
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | ||
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | ||
@@ -2678,7 +2678,7 @@ static int stmmac_poll(struct napi_struc | ||
@@ -2684,7 +2684,7 @@ static int stmmac_poll(struct napi_struc | ||
|
||
work_done = stmmac_rx(priv, budget); | ||
if (work_done < budget) { | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -13,7 +13,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
|
||
--- a/drivers/base/Kconfig | ||
+++ b/drivers/base/Kconfig | ||
@@ -243,7 +243,7 @@ config SOC_BUS | ||
@@ -246,7 +246,7 @@ config SOC_BUS | ||
source "drivers/base/regmap/Kconfig" | ||
|
||
config DMA_SHARED_BUFFER | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -137,7 +137,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
add_taint_module(mod, TAINT_CRAP, LOCKDEP_STILL_OK); | ||
--- a/scripts/mod/modpost.c | ||
+++ b/scripts/mod/modpost.c | ||
@@ -1964,7 +1964,9 @@ static void read_symbols(char *modname) | ||
@@ -1965,7 +1965,9 @@ static void read_symbols(char *modname) | ||
symname = remove_dot(info.strtab + sym->st_name); | ||
|
||
handle_modversions(mod, &info, sym, symname); | ||
|
@@ -147,7 +147,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
} | ||
if (!is_vmlinux(modname) || | ||
(is_vmlinux(modname) && vmlinux_section_warnings)) | ||
@@ -2108,7 +2110,9 @@ static void add_header(struct buffer *b, | ||
@@ -2109,7 +2111,9 @@ static void add_header(struct buffer *b, | ||
buf_printf(b, "#include <linux/vermagic.h>\n"); | ||
buf_printf(b, "#include <linux/compiler.h>\n"); | ||
buf_printf(b, "\n"); | ||
|
@@ -157,7 +157,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
buf_printf(b, "\n"); | ||
buf_printf(b, "__visible struct module __this_module\n"); | ||
buf_printf(b, "__attribute__((section(\".gnu.linkonce.this_module\"))) = {\n"); | ||
@@ -2125,16 +2129,20 @@ static void add_header(struct buffer *b, | ||
@@ -2126,16 +2130,20 @@ static void add_header(struct buffer *b, | ||
|
||
static void add_intree_flag(struct buffer *b, int is_intree) | ||
{ | ||
|
@@ -178,7 +178,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
} | ||
|
||
/* In kernel, this size is defined in linux/module.h; | ||
@@ -2238,11 +2246,13 @@ static void add_depends(struct buffer *b | ||
@@ -2239,11 +2247,13 @@ static void add_depends(struct buffer *b | ||
|
||
static void add_srcversion(struct buffer *b, struct module *mod) | ||
{ | ||
|
@@ -192,7 +192,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
} | ||
|
||
static void write_if_changed(struct buffer *b, const char *fname) | ||
@@ -2476,7 +2486,9 @@ int main(int argc, char **argv) | ||
@@ -2477,7 +2487,9 @@ int main(int argc, char **argv) | ||
add_staging_flag(&buf, mod->name); | ||
err |= add_versions(&buf, mod); | ||
add_depends(&buf, mod, modules); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -13,7 +13,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
|
||
--- a/drivers/base/Kconfig | ||
+++ b/drivers/base/Kconfig | ||
@@ -241,7 +241,7 @@ config SOC_BUS | ||
@@ -244,7 +244,7 @@ config SOC_BUS | ||
source "drivers/base/regmap/Kconfig" | ||
|
||
config DMA_SHARED_BUFFER | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -300,15 +300,15 @@ Signed-off-by: Steven Barth <[email protected]> | |
/** | ||
* ip6_tnl_addr_conflict - compare packet addresses to tunnel's own | ||
* @t: the outgoing tunnel device | ||
@@ -1295,6 +1435,7 @@ ip6ip6_tnl_xmit(struct sk_buff *skb, str | ||
@@ -1296,6 +1436,7 @@ ip6ip6_tnl_xmit(struct sk_buff *skb, str | ||
{ | ||
struct ip6_tnl *t = netdev_priv(dev); | ||
struct ipv6hdr *ipv6h = ipv6_hdr(skb); | ||
+ struct __ip6_tnl_fmr *fmr; | ||
int encap_limit = -1; | ||
__u16 offset; | ||
struct flowi6 fl6; | ||
@@ -1357,6 +1498,18 @@ ip6ip6_tnl_xmit(struct sk_buff *skb, str | ||
@@ -1358,6 +1499,18 @@ ip6ip6_tnl_xmit(struct sk_buff *skb, str | ||
|
||
fl6.flowi6_uid = sock_net_uid(dev_net(dev), NULL); | ||
|
||
|
@@ -327,7 +327,7 @@ Signed-off-by: Steven Barth <[email protected]> | |
if (iptunnel_handle_offloads(skb, SKB_GSO_IPXIP6)) | ||
return -1; | ||
|
||
@@ -1485,6 +1638,14 @@ ip6_tnl_change(struct ip6_tnl *t, const | ||
@@ -1486,6 +1639,14 @@ ip6_tnl_change(struct ip6_tnl *t, const | ||
t->parms.link = p->link; | ||
t->parms.proto = p->proto; | ||
t->parms.fwmark = p->fwmark; | ||
|
@@ -342,15 +342,15 @@ Signed-off-by: Steven Barth <[email protected]> | |
dst_cache_reset(&t->dst_cache); | ||
ip6_tnl_link_config(t); | ||
return 0; | ||
@@ -1523,6 +1684,7 @@ ip6_tnl_parm_from_user(struct __ip6_tnl_ | ||
@@ -1524,6 +1685,7 @@ ip6_tnl_parm_from_user(struct __ip6_tnl_ | ||
p->flowinfo = u->flowinfo; | ||
p->link = u->link; | ||
p->proto = u->proto; | ||
+ p->fmrs = NULL; | ||
memcpy(p->name, u->name, sizeof(u->name)); | ||
} | ||
|
||
@@ -1904,6 +2066,15 @@ static int ip6_tnl_validate(struct nlatt | ||
@@ -1905,6 +2067,15 @@ static int ip6_tnl_validate(struct nlatt | ||
return 0; | ||
} | ||
|
||
|
@@ -366,7 +366,7 @@ Signed-off-by: Steven Barth <[email protected]> | |
static void ip6_tnl_netlink_parms(struct nlattr *data[], | ||
struct __ip6_tnl_parm *parms) | ||
{ | ||
@@ -1941,6 +2112,46 @@ static void ip6_tnl_netlink_parms(struct | ||
@@ -1942,6 +2113,46 @@ static void ip6_tnl_netlink_parms(struct | ||
|
||
if (data[IFLA_IPTUN_FWMARK]) | ||
parms->fwmark = nla_get_u32(data[IFLA_IPTUN_FWMARK]); | ||
|
@@ -413,7 +413,7 @@ Signed-off-by: Steven Barth <[email protected]> | |
} | ||
|
||
static bool ip6_tnl_netlink_encap_parms(struct nlattr *data[], | ||
@@ -2052,6 +2263,12 @@ static void ip6_tnl_dellink(struct net_d | ||
@@ -2053,6 +2264,12 @@ static void ip6_tnl_dellink(struct net_d | ||
|
||
static size_t ip6_tnl_get_size(const struct net_device *dev) | ||
{ | ||
|
@@ -426,7 +426,7 @@ Signed-off-by: Steven Barth <[email protected]> | |
return | ||
/* IFLA_IPTUN_LINK */ | ||
nla_total_size(4) + | ||
@@ -2081,6 +2298,24 @@ static size_t ip6_tnl_get_size(const str | ||
@@ -2082,6 +2299,24 @@ static size_t ip6_tnl_get_size(const str | ||
nla_total_size(0) + | ||
/* IFLA_IPTUN_FWMARK */ | ||
nla_total_size(4) + | ||
|
@@ -451,7 +451,7 @@ Signed-off-by: Steven Barth <[email protected]> | |
0; | ||
} | ||
|
||
@@ -2088,6 +2323,9 @@ static int ip6_tnl_fill_info(struct sk_b | ||
@@ -2089,6 +2324,9 @@ static int ip6_tnl_fill_info(struct sk_b | ||
{ | ||
struct ip6_tnl *tunnel = netdev_priv(dev); | ||
struct __ip6_tnl_parm *parm = &tunnel->parms; | ||
|
@@ -461,7 +461,7 @@ Signed-off-by: Steven Barth <[email protected]> | |
|
||
if (nla_put_u32(skb, IFLA_IPTUN_LINK, parm->link) || | ||
nla_put_in6_addr(skb, IFLA_IPTUN_LOCAL, &parm->laddr) || | ||
@@ -2097,9 +2335,27 @@ static int ip6_tnl_fill_info(struct sk_b | ||
@@ -2098,9 +2336,27 @@ static int ip6_tnl_fill_info(struct sk_b | ||
nla_put_be32(skb, IFLA_IPTUN_FLOWINFO, parm->flowinfo) || | ||
nla_put_u32(skb, IFLA_IPTUN_FLAGS, parm->flags) || | ||
nla_put_u8(skb, IFLA_IPTUN_PROTO, parm->proto) || | ||
|
@@ -490,7 +490,7 @@ Signed-off-by: Steven Barth <[email protected]> | |
if (nla_put_u16(skb, IFLA_IPTUN_ENCAP_TYPE, tunnel->encap.type) || | ||
nla_put_be16(skb, IFLA_IPTUN_ENCAP_SPORT, tunnel->encap.sport) || | ||
nla_put_be16(skb, IFLA_IPTUN_ENCAP_DPORT, tunnel->encap.dport) || | ||
@@ -2139,6 +2395,7 @@ static const struct nla_policy ip6_tnl_p | ||
@@ -2140,6 +2396,7 @@ static const struct nla_policy ip6_tnl_p | ||
[IFLA_IPTUN_ENCAP_DPORT] = { .type = NLA_U16 }, | ||
[IFLA_IPTUN_COLLECT_METADATA] = { .type = NLA_FLAG }, | ||
[IFLA_IPTUN_FWMARK] = { .type = NLA_U32 }, | ||
|
Oops, something went wrong.