aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-4.3
diff options
context:
space:
mode:
authorLuka Perkov <luka@openwrt.org>2015-11-04 22:28:40 +0000
committerLuka Perkov <luka@openwrt.org>2015-11-04 22:28:40 +0000
commit122fadaa003cf6fa969076e147ee11b690de684b (patch)
tree8b3c205ab6c0a0f4f2007995484465975408674b /target/linux/generic/patches-4.3
parentb8b4d363797192a416f08327753842550fd13ea3 (diff)
downloadupstream-122fadaa003cf6fa969076e147ee11b690de684b.tar.gz
upstream-122fadaa003cf6fa969076e147ee11b690de684b.tar.bz2
upstream-122fadaa003cf6fa969076e147ee11b690de684b.zip
kernel: update kernel 4.3-rc7 to version 4.3
Signed-off-by: Luka Perkov <luka@openwrt.org> SVN-Revision: 47384
Diffstat (limited to 'target/linux/generic/patches-4.3')
-rw-r--r--target/linux/generic/patches-4.3/204-module_strip.patch4
-rw-r--r--target/linux/generic/patches-4.3/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch20
-rw-r--r--target/linux/generic/patches-4.3/680-NET-skip-GRO-for-foreign-MAC-addresses.patch12
-rw-r--r--target/linux/generic/patches-4.3/720-phy_adm6996.patch2
-rw-r--r--target/linux/generic/patches-4.3/721-phy_packets.patch10
-rw-r--r--target/linux/generic/patches-4.3/722-phy_mvswitch.patch2
-rw-r--r--target/linux/generic/patches-4.3/723-phy_ip175c.patch2
-rw-r--r--target/linux/generic/patches-4.3/724-phy_ar8216.patch2
-rw-r--r--target/linux/generic/patches-4.3/725-phy_rtl8306.patch2
-rw-r--r--target/linux/generic/patches-4.3/726-phy_rtl8366.patch2
-rw-r--r--target/linux/generic/patches-4.3/727-phy-rtl8367.patch2
-rw-r--r--target/linux/generic/patches-4.3/728-phy-rtl8367b.patch2
-rw-r--r--target/linux/generic/patches-4.3/729-phy-tantos.patch2
-rw-r--r--target/linux/generic/patches-4.3/730-phy_b53.patch2
-rw-r--r--target/linux/generic/patches-4.3/732-phy-ar8216-led-support.patch2
-rw-r--r--target/linux/generic/patches-4.3/733-phy_mvsw61xx.patch2
-rw-r--r--target/linux/generic/patches-4.3/863-gpiommc.patch2
17 files changed, 36 insertions, 36 deletions
diff --git a/target/linux/generic/patches-4.3/204-module_strip.patch b/target/linux/generic/patches-4.3/204-module_strip.patch
index 4080ee6974..32f979ab9d 100644
--- a/target/linux/generic/patches-4.3/204-module_strip.patch
+++ b/target/linux/generic/patches-4.3/204-module_strip.patch
@@ -109,7 +109,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
config MODULES_TREE_LOOKUP
--- a/kernel/module.c
+++ b/kernel/module.c
-@@ -2836,6 +2836,7 @@ static struct module *setup_load_info(st
+@@ -2840,6 +2840,7 @@ static struct module *setup_load_info(st
static int check_modinfo(struct module *mod, struct load_info *info, int flags)
{
@@ -117,7 +117,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
const char *modmagic = get_modinfo(info, "vermagic");
int err;
-@@ -2861,6 +2862,7 @@ static int check_modinfo(struct module *
+@@ -2865,6 +2866,7 @@ static int check_modinfo(struct module *
pr_warn("%s: module is from the staging directory, the quality "
"is unknown, you have been warned.\n", mod->name);
}
diff --git a/target/linux/generic/patches-4.3/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch b/target/linux/generic/patches-4.3/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
index d2e14652ca..7ae6abf80d 100644
--- a/target/linux/generic/patches-4.3/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
+++ b/target/linux/generic/patches-4.3/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
@@ -88,7 +88,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
default:
--- a/net/ipv6/fib6_rules.c
+++ b/net/ipv6/fib6_rules.c
-@@ -73,6 +73,10 @@ static int fib6_rule_action(struct fib_r
+@@ -84,6 +84,10 @@ static int fib6_rule_action(struct fib_r
err = -EACCES;
rt = net->ipv6.ip6_prohibit_entry;
goto discard_pkt;
@@ -143,7 +143,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
static const struct rt6_info ip6_blk_hole_entry_template = {
.dst = {
.__refcnt = ATOMIC_INIT(1),
-@@ -1881,6 +1898,11 @@ int ip6_route_info_create(struct fib6_co
+@@ -1886,6 +1903,11 @@ int ip6_route_info_create(struct fib6_co
rt->dst.output = ip6_pkt_prohibit_out;
rt->dst.input = ip6_pkt_prohibit;
break;
@@ -155,7 +155,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
case RTN_THROW:
case RTN_UNREACHABLE:
default:
-@@ -2483,6 +2505,17 @@ static int ip6_pkt_prohibit_out(struct s
+@@ -2488,6 +2510,17 @@ static int ip6_pkt_prohibit_out(struct s
return ip6_pkt_drop(skb, ICMPV6_ADM_PROHIBITED, IPSTATS_MIB_OUTNOROUTES);
}
@@ -173,7 +173,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
/*
* Allocate a dst for local (unicast / anycast) address.
*/
-@@ -2723,7 +2756,8 @@ static int rtm_to_fib6_config(struct sk_
+@@ -2728,7 +2761,8 @@ static int rtm_to_fib6_config(struct sk_
if (rtm->rtm_type == RTN_UNREACHABLE ||
rtm->rtm_type == RTN_BLACKHOLE ||
rtm->rtm_type == RTN_PROHIBIT ||
@@ -183,7 +183,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
cfg->fc_flags |= RTF_REJECT;
if (rtm->rtm_type == RTN_LOCAL)
-@@ -3079,6 +3113,9 @@ static int rt6_fill_node(struct net *net
+@@ -3084,6 +3118,9 @@ static int rt6_fill_node(struct net *net
case -EACCES:
rtm->rtm_type = RTN_PROHIBIT;
break;
@@ -193,7 +193,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
case -EAGAIN:
rtm->rtm_type = RTN_THROW;
break;
-@@ -3347,6 +3384,8 @@ static int ip6_route_dev_notify(struct n
+@@ -3352,6 +3389,8 @@ static int ip6_route_dev_notify(struct n
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
net->ipv6.ip6_prohibit_entry->dst.dev = dev;
net->ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(dev);
@@ -202,7 +202,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
net->ipv6.ip6_blk_hole_entry->dst.dev = dev;
net->ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(dev);
#endif
-@@ -3563,6 +3602,17 @@ static int __net_init ip6_route_net_init
+@@ -3568,6 +3607,17 @@ static int __net_init ip6_route_net_init
net->ipv6.ip6_blk_hole_entry->dst.ops = &net->ipv6.ip6_dst_ops;
dst_init_metrics(&net->ipv6.ip6_blk_hole_entry->dst,
ip6_template_metrics, true);
@@ -220,7 +220,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
#endif
net->ipv6.sysctl.flush_delay = 0;
-@@ -3581,6 +3631,8 @@ out:
+@@ -3586,6 +3636,8 @@ out:
return ret;
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
@@ -229,7 +229,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
out_ip6_prohibit_entry:
kfree(net->ipv6.ip6_prohibit_entry);
out_ip6_null_entry:
-@@ -3598,6 +3650,7 @@ static void __net_exit ip6_route_net_exi
+@@ -3603,6 +3655,7 @@ static void __net_exit ip6_route_net_exi
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
kfree(net->ipv6.ip6_prohibit_entry);
kfree(net->ipv6.ip6_blk_hole_entry);
@@ -237,7 +237,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
#endif
dst_entries_destroy(&net->ipv6.ip6_dst_ops);
}
-@@ -3695,6 +3748,9 @@ int __init ip6_route_init(void)
+@@ -3700,6 +3753,9 @@ int __init ip6_route_init(void)
init_net.ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
init_net.ipv6.ip6_blk_hole_entry->dst.dev = init_net.loopback_dev;
init_net.ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
diff --git a/target/linux/generic/patches-4.3/680-NET-skip-GRO-for-foreign-MAC-addresses.patch b/target/linux/generic/patches-4.3/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
index 1d86e2f0d6..c6734e0904 100644
--- a/target/linux/generic/patches-4.3/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
+++ b/target/linux/generic/patches-4.3/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
@@ -17,7 +17,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
--- a/net/core/dev.c
+++ b/net/core/dev.c
-@@ -4158,6 +4158,9 @@ static enum gro_result dev_gro_receive(s
+@@ -4185,6 +4185,9 @@ static enum gro_result dev_gro_receive(s
enum gro_result ret;
int grow;
@@ -27,7 +27,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
if (!(skb->dev->features & NETIF_F_GRO))
goto normal;
-@@ -5309,6 +5312,48 @@ static void __netdev_adjacent_dev_unlink
+@@ -5336,6 +5339,48 @@ static void __netdev_adjacent_dev_unlink
&upper_dev->adj_list.lower);
}
@@ -76,7 +76,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
static int __netdev_upper_dev_link(struct net_device *dev,
struct net_device *upper_dev, bool master,
void *private)
-@@ -5374,6 +5419,7 @@ static int __netdev_upper_dev_link(struc
+@@ -5401,6 +5446,7 @@ static int __netdev_upper_dev_link(struc
goto rollback_lower_mesh;
}
@@ -84,7 +84,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev,
&changeupper_info.info);
return 0;
-@@ -5497,6 +5543,7 @@ void netdev_upper_dev_unlink(struct net_
+@@ -5524,6 +5570,7 @@ void netdev_upper_dev_unlink(struct net_
list_for_each_entry(i, &upper_dev->all_adj_list.upper, list)
__netdev_adjacent_dev_unlink(dev, i->dev);
@@ -92,7 +92,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev,
&changeupper_info.info);
}
-@@ -6037,6 +6084,7 @@ int dev_set_mac_address(struct net_devic
+@@ -6064,6 +6111,7 @@ int dev_set_mac_address(struct net_devic
if (err)
return err;
dev->addr_assign_type = NET_ADDR_SET;
@@ -102,7 +102,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
return 0;
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
-@@ -1623,6 +1623,8 @@ struct net_device {
+@@ -1629,6 +1629,8 @@ struct net_device {
struct netdev_hw_addr_list mc;
struct netdev_hw_addr_list dev_addrs;
diff --git a/target/linux/generic/patches-4.3/720-phy_adm6996.patch b/target/linux/generic/patches-4.3/720-phy_adm6996.patch
index 1c32b761ad..fa716d0a98 100644
--- a/target/linux/generic/patches-4.3/720-phy_adm6996.patch
+++ b/target/linux/generic/patches-4.3/720-phy_adm6996.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
-@@ -146,6 +146,13 @@ config MICROCHIP_PHY
+@@ -151,6 +151,13 @@ config MICROCHIP_PHY
help
Supports the LAN88XX PHYs.
diff --git a/target/linux/generic/patches-4.3/721-phy_packets.patch b/target/linux/generic/patches-4.3/721-phy_packets.patch
index e83eadb7f9..b7e04abcde 100644
--- a/target/linux/generic/patches-4.3/721-phy_packets.patch
+++ b/target/linux/generic/patches-4.3/721-phy_packets.patch
@@ -1,6 +1,6 @@
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
-@@ -1286,6 +1286,7 @@ enum netdev_priv_flags {
+@@ -1292,6 +1292,7 @@ enum netdev_priv_flags {
IFF_VRF_MASTER = 1<<20,
IFF_NO_QUEUE = 1<<21,
IFF_OPENVSWITCH = 1<<22,
@@ -8,7 +8,7 @@
};
#define IFF_802_1Q_VLAN IFF_802_1Q_VLAN
-@@ -1311,6 +1312,7 @@ enum netdev_priv_flags {
+@@ -1317,6 +1318,7 @@ enum netdev_priv_flags {
#define IFF_VRF_MASTER IFF_VRF_MASTER
#define IFF_NO_QUEUE IFF_NO_QUEUE
#define IFF_OPENVSWITCH IFF_OPENVSWITCH
@@ -16,7 +16,7 @@
/**
* struct net_device - The DEVICE structure.
-@@ -1588,6 +1590,11 @@ struct net_device {
+@@ -1594,6 +1596,11 @@ struct net_device {
const struct switchdev_ops *switchdev_ops;
#endif
@@ -28,7 +28,7 @@
const struct header_ops *header_ops;
unsigned int flags;
-@@ -1655,6 +1662,10 @@ struct net_device {
+@@ -1661,6 +1668,10 @@ struct net_device {
struct mpls_dev __rcu *mpls_ptr;
#endif
@@ -86,7 +86,7 @@
help
--- a/net/core/dev.c
+++ b/net/core/dev.c
-@@ -2678,10 +2678,20 @@ static int xmit_one(struct sk_buff *skb,
+@@ -2705,10 +2705,20 @@ static int xmit_one(struct sk_buff *skb,
if (!list_empty(&ptype_all) || !list_empty(&dev->ptype_all))
dev_queue_xmit_nit(skb, dev);
diff --git a/target/linux/generic/patches-4.3/722-phy_mvswitch.patch b/target/linux/generic/patches-4.3/722-phy_mvswitch.patch
index 2d366bf65c..2ecae240c5 100644
--- a/target/linux/generic/patches-4.3/722-phy_mvswitch.patch
+++ b/target/linux/generic/patches-4.3/722-phy_mvswitch.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
-@@ -153,6 +153,10 @@ config ADM6996_PHY
+@@ -158,6 +158,10 @@ config ADM6996_PHY
Currently supports the ADM6996FC and ADM6996M switches.
Support for FC is very limited.
diff --git a/target/linux/generic/patches-4.3/723-phy_ip175c.patch b/target/linux/generic/patches-4.3/723-phy_ip175c.patch
index e5c9bce05f..4b711a2292 100644
--- a/target/linux/generic/patches-4.3/723-phy_ip175c.patch
+++ b/target/linux/generic/patches-4.3/723-phy_ip175c.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
-@@ -157,6 +157,10 @@ config MVSWITCH_PHY
+@@ -162,6 +162,10 @@ config MVSWITCH_PHY
tristate "Driver for Marvell 88E6060 switches"
select ETHERNET_PACKET_MANGLE
diff --git a/target/linux/generic/patches-4.3/724-phy_ar8216.patch b/target/linux/generic/patches-4.3/724-phy_ar8216.patch
index de940373d6..9b1f3d1899 100644
--- a/target/linux/generic/patches-4.3/724-phy_ar8216.patch
+++ b/target/linux/generic/patches-4.3/724-phy_ar8216.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
-@@ -161,6 +161,11 @@ config IP17XX_PHY
+@@ -166,6 +166,11 @@ config IP17XX_PHY
tristate "Driver for IC+ IP17xx switches"
select SWCONFIG
diff --git a/target/linux/generic/patches-4.3/725-phy_rtl8306.patch b/target/linux/generic/patches-4.3/725-phy_rtl8306.patch
index 803e770590..5ce2272a0f 100644
--- a/target/linux/generic/patches-4.3/725-phy_rtl8306.patch
+++ b/target/linux/generic/patches-4.3/725-phy_rtl8306.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
-@@ -166,6 +166,10 @@ config AR8216_PHY
+@@ -171,6 +171,10 @@ config AR8216_PHY
select ETHERNET_PACKET_MANGLE
select SWCONFIG
diff --git a/target/linux/generic/patches-4.3/726-phy_rtl8366.patch b/target/linux/generic/patches-4.3/726-phy_rtl8366.patch
index bba83b3065..2547f66b89 100644
--- a/target/linux/generic/patches-4.3/726-phy_rtl8366.patch
+++ b/target/linux/generic/patches-4.3/726-phy_rtl8366.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
-@@ -261,6 +261,31 @@ config MDIO_BCM_UNIMAC
+@@ -266,6 +266,31 @@ config MDIO_BCM_UNIMAC
This hardware can be found in the Broadcom GENET Ethernet MAC
controllers as well as some Broadcom Ethernet switches such as the
Starfighter 2 switches.
diff --git a/target/linux/generic/patches-4.3/727-phy-rtl8367.patch b/target/linux/generic/patches-4.3/727-phy-rtl8367.patch
index a10856f427..d78c68d7c3 100644
--- a/target/linux/generic/patches-4.3/727-phy-rtl8367.patch
+++ b/target/linux/generic/patches-4.3/727-phy-rtl8367.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
-@@ -284,6 +284,10 @@ config RTL8366RB_PHY
+@@ -289,6 +289,10 @@ config RTL8366RB_PHY
tristate "Driver for the Realtek RTL8366RB switch"
select SWCONFIG
diff --git a/target/linux/generic/patches-4.3/728-phy-rtl8367b.patch b/target/linux/generic/patches-4.3/728-phy-rtl8367b.patch
index 881be7df34..5c329f639a 100644
--- a/target/linux/generic/patches-4.3/728-phy-rtl8367b.patch
+++ b/target/linux/generic/patches-4.3/728-phy-rtl8367b.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
-@@ -288,6 +288,10 @@ config RTL8367_PHY
+@@ -293,6 +293,10 @@ config RTL8367_PHY
tristate "Driver for the Realtek RTL8367R/M switches"
select SWCONFIG
diff --git a/target/linux/generic/patches-4.3/729-phy-tantos.patch b/target/linux/generic/patches-4.3/729-phy-tantos.patch
index 19ea8b0b3e..12ae990d14 100644
--- a/target/linux/generic/patches-4.3/729-phy-tantos.patch
+++ b/target/linux/generic/patches-4.3/729-phy-tantos.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
-@@ -299,3 +299,8 @@ endif # PHYLIB
+@@ -304,3 +304,8 @@ endif # PHYLIB
config MICREL_KS8995MA
tristate "Micrel KS8995MA 5-ports 10/100 managed Ethernet switch"
depends on SPI
diff --git a/target/linux/generic/patches-4.3/730-phy_b53.patch b/target/linux/generic/patches-4.3/730-phy_b53.patch
index 648919fdb3..83a646038e 100644
--- a/target/linux/generic/patches-4.3/730-phy_b53.patch
+++ b/target/linux/generic/patches-4.3/730-phy_b53.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
-@@ -294,6 +294,8 @@ config RTL8367B_PHY
+@@ -299,6 +299,8 @@ config RTL8367B_PHY
endif # RTL8366_SMI
diff --git a/target/linux/generic/patches-4.3/732-phy-ar8216-led-support.patch b/target/linux/generic/patches-4.3/732-phy-ar8216-led-support.patch
index 7567f6625b..3791269ad8 100644
--- a/target/linux/generic/patches-4.3/732-phy-ar8216-led-support.patch
+++ b/target/linux/generic/patches-4.3/732-phy-ar8216-led-support.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
-@@ -166,6 +166,10 @@ config AR8216_PHY
+@@ -171,6 +171,10 @@ config AR8216_PHY
select ETHERNET_PACKET_MANGLE
select SWCONFIG
diff --git a/target/linux/generic/patches-4.3/733-phy_mvsw61xx.patch b/target/linux/generic/patches-4.3/733-phy_mvsw61xx.patch
index 9f7274c472..2b315a71d3 100644
--- a/target/linux/generic/patches-4.3/733-phy_mvsw61xx.patch
+++ b/target/linux/generic/patches-4.3/733-phy_mvsw61xx.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
-@@ -157,6 +157,10 @@ config MVSWITCH_PHY
+@@ -162,6 +162,10 @@ config MVSWITCH_PHY
tristate "Driver for Marvell 88E6060 switches"
select ETHERNET_PACKET_MANGLE
diff --git a/target/linux/generic/patches-4.3/863-gpiommc.patch b/target/linux/generic/patches-4.3/863-gpiommc.patch
index 8f786b9e9e..27115a068f 100644
--- a/target/linux/generic/patches-4.3/863-gpiommc.patch
+++ b/target/linux/generic/patches-4.3/863-gpiommc.patch
@@ -830,7 +830,7 @@
+be done automatically.
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -4792,6 +4792,11 @@ T: git git://linuxtv.org/anttip/media_tr
+@@ -4800,6 +4800,11 @@ T: git git://linuxtv.org/anttip/media_tr
S: Maintained
F: drivers/media/usb/hackrf/