4.4.82 is released.
Best Regards, Syrone Wong On Sun, Aug 13, 2017 at 4:14 AM, Kevin Darbyshire-Bryant <ke...@darbyshire-bryant.me.uk> wrote: > refresh patches > minor update 704-phy-no-genphy-soft-reset.patch which was partially > accepted upstream. > > Signed-off-by: Kevin Darbyshire-Bryant <ke...@darbyshire-bryant.me.uk> > --- > include/kernel-version.mk | 4 ++-- > ...80-NET-skip-GRO-for-foreign-MAC-addresses.patch | 10 +++++----- > .../generic/pending-4.4/701-phy_extension.patch | 2 +- > .../pending-4.4/704-phy-no-genphy-soft-reset.patch | 22 > ++-------------------- > .../710-phy-add-mdio_register_board_info.patch | 2 +- > .../generic/pending-4.4/721-phy_packets.patch | 2 +- > .../patches-4.4/0026-NET-multi-phy-support.patch | 6 +++--- > ...ovide-a-hook-for-link-up-link-down-events.patch | 18 +++++++++--------- > ...8-phy-export-phy_speed_to_str-for-phylink.patch | 2 +- > 9 files changed, 25 insertions(+), 43 deletions(-) > > diff --git a/include/kernel-version.mk b/include/kernel-version.mk > index ca2cb8f..cf5d752 100644 > --- a/include/kernel-version.mk > +++ b/include/kernel-version.mk > @@ -3,11 +3,11 @@ > LINUX_RELEASE?=1 > > LINUX_VERSION-3.18 = .43 > -LINUX_VERSION-4.4 = .79 > +LINUX_VERSION-4.4 = .81 > LINUX_VERSION-4.9 = .40 > > LINUX_KERNEL_HASH-3.18.43 = > 1236e8123a6ce537d5029232560966feed054ae31776fe8481dd7d18cdd5492c > -LINUX_KERNEL_HASH-4.4.79 = > 0dbda3b51e11957fdb96c46844a823a212d46d6db680d77422ddea1a65bebca8 > +LINUX_KERNEL_HASH-4.4.81 = > 633b1f32ec59eeb0f093447315c5189c80fa87032fb0a515fd4fe93d53dd856f > LINUX_KERNEL_HASH-4.9.40 = > 025767f3652a656c7b5ed2949aef205f88a5acfd70ae3fe77710ad37f1662d9b > > ifdef KERNEL_PATCHVER > diff --git > a/target/linux/generic/pending-4.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch > > b/target/linux/generic/pending-4.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch > index 0c58710..0616eaa 100644 > --- > a/target/linux/generic/pending-4.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch > +++ > b/target/linux/generic/pending-4.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch > @@ -17,7 +17,7 @@ Signed-off-by: Felix Fietkau <n...@nbd.name> > > --- a/net/core/dev.c > +++ b/net/core/dev.c > -@@ -4249,6 +4249,9 @@ static enum gro_result dev_gro_receive(s > +@@ -4256,6 +4256,9 @@ static enum gro_result dev_gro_receive(s > enum gro_result ret; > int grow; > > @@ -27,7 +27,7 @@ Signed-off-by: Felix Fietkau <n...@nbd.name> > if (!(skb->dev->features & NETIF_F_GRO)) > goto normal; > > -@@ -5415,6 +5418,48 @@ static void __netdev_adjacent_dev_unlink > +@@ -5422,6 +5425,48 @@ static void __netdev_adjacent_dev_unlink > &upper_dev->adj_list.lower); > } > > @@ -76,7 +76,7 @@ Signed-off-by: Felix Fietkau <n...@nbd.name> > static int __netdev_upper_dev_link(struct net_device *dev, > struct net_device *upper_dev, bool master, > void *private) > -@@ -5486,6 +5531,7 @@ static int __netdev_upper_dev_link(struc > +@@ -5493,6 +5538,7 @@ static int __netdev_upper_dev_link(struc > goto rollback_lower_mesh; > } > > @@ -84,7 +84,7 @@ Signed-off-by: Felix Fietkau <n...@nbd.name> > call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev, > &changeupper_info.info); > return 0; > -@@ -5612,6 +5658,7 @@ void netdev_upper_dev_unlink(struct net_ > +@@ -5619,6 +5665,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, i->ref_nr); > > @@ -92,7 +92,7 @@ Signed-off-by: Felix Fietkau <n...@nbd.name> > call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev, > &changeupper_info.info); > } > -@@ -6152,6 +6199,7 @@ int dev_set_mac_address(struct net_devic > +@@ -6159,6 +6206,7 @@ int dev_set_mac_address(struct net_devic > if (err) > return err; > dev->addr_assign_type = NET_ADDR_SET; > diff --git a/target/linux/generic/pending-4.4/701-phy_extension.patch > b/target/linux/generic/pending-4.4/701-phy_extension.patch > index 6cb3fdf..a1c48b7 100644 > --- a/target/linux/generic/pending-4.4/701-phy_extension.patch > +++ b/target/linux/generic/pending-4.4/701-phy_extension.patch > @@ -53,7 +53,7 @@ > * @phydev: the phy_device struct > --- a/include/linux/phy.h > +++ b/include/linux/phy.h > -@@ -796,6 +796,7 @@ void phy_start_machine(struct phy_device > +@@ -800,6 +800,7 @@ void phy_start_machine(struct phy_device > void phy_stop_machine(struct phy_device *phydev); > int phy_ethtool_sset(struct phy_device *phydev, struct ethtool_cmd *cmd); > int phy_ethtool_gset(struct phy_device *phydev, struct ethtool_cmd *cmd); > diff --git > a/target/linux/generic/pending-4.4/704-phy-no-genphy-soft-reset.patch > b/target/linux/generic/pending-4.4/704-phy-no-genphy-soft-reset.patch > index d876187..7cec6d3 100644 > --- a/target/linux/generic/pending-4.4/704-phy-no-genphy-soft-reset.patch > +++ b/target/linux/generic/pending-4.4/704-phy-no-genphy-soft-reset.patch > @@ -1,29 +1,11 @@ > --- a/drivers/net/phy/phy_device.c > +++ b/drivers/net/phy/phy_device.c > -@@ -1213,7 +1213,7 @@ int genphy_config_init(struct phy_device > - return 0; > - } > - > --static int gen10g_soft_reset(struct phy_device *phydev) > -+static int no_soft_reset(struct phy_device *phydev) > - { > - /* Do nothing for now */ > - return 0; > -@@ -1448,7 +1448,7 @@ static struct phy_driver genphy_driver[] > - .phy_id = 0xffffffff, > - .phy_id_mask = 0xffffffff, > - .name = "Generic PHY", > -- .soft_reset = genphy_soft_reset, > -+ .soft_reset = no_soft_reset, > - .config_init = genphy_config_init, > - .features = PHY_GBIT_FEATURES | SUPPORTED_MII | > - SUPPORTED_AUI | SUPPORTED_FIBRE | > -@@ -1463,7 +1463,7 @@ static struct phy_driver genphy_driver[] > +@@ -1465,7 +1465,7 @@ static struct phy_driver genphy_driver[] > .phy_id = 0xffffffff, > .phy_id_mask = 0xffffffff, > .name = "Generic 10G PHY", > - .soft_reset = gen10g_soft_reset, > -+ .soft_reset = no_soft_reset, > ++ .soft_reset = genphy_no_soft_reset, > .config_init = gen10g_config_init, > .features = 0, > .config_aneg = gen10g_config_aneg, > diff --git > a/target/linux/generic/pending-4.4/710-phy-add-mdio_register_board_info.patch > b/target/linux/generic/pending-4.4/710-phy-add-mdio_register_board_info.patch > index 4886dd0..bd15df2 100644 > --- > a/target/linux/generic/pending-4.4/710-phy-add-mdio_register_board_info.patch > +++ > b/target/linux/generic/pending-4.4/710-phy-add-mdio_register_board_info.patch > @@ -46,7 +46,7 @@ > phy_device_free(phydev); > --- a/include/linux/phy.h > +++ b/include/linux/phy.h > -@@ -835,6 +835,23 @@ void mdio_bus_exit(void); > +@@ -839,6 +839,23 @@ void mdio_bus_exit(void); > > extern struct bus_type mdio_bus_type; > > diff --git a/target/linux/generic/pending-4.4/721-phy_packets.patch > b/target/linux/generic/pending-4.4/721-phy_packets.patch > index b163684..89ffdc5 100644 > --- a/target/linux/generic/pending-4.4/721-phy_packets.patch > +++ b/target/linux/generic/pending-4.4/721-phy_packets.patch > @@ -86,7 +86,7 @@ > help > --- a/net/core/dev.c > +++ b/net/core/dev.c > -@@ -2736,10 +2736,20 @@ static int xmit_one(struct sk_buff *skb, > +@@ -2743,10 +2743,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/lantiq/patches-4.4/0026-NET-multi-phy-support.patch > b/target/linux/lantiq/patches-4.4/0026-NET-multi-phy-support.patch > index 381170a..f52f6f5 100644 > --- a/target/linux/lantiq/patches-4.4/0026-NET-multi-phy-support.patch > +++ b/target/linux/lantiq/patches-4.4/0026-NET-multi-phy-support.patch > @@ -11,7 +11,7 @@ Signed-off-by: John Crispin <blo...@openwrt.org> > > --- a/drivers/net/phy/phy.c > +++ b/drivers/net/phy/phy.c > -@@ -890,7 +890,8 @@ void phy_state_machine(struct work_struc > +@@ -893,7 +893,8 @@ void phy_state_machine(struct work_struc > /* If the link is down, give up on negotiation for now */ > if (!phydev->link) { > phydev->state = PHY_NOLINK; > @@ -21,7 +21,7 @@ Signed-off-by: John Crispin <blo...@openwrt.org> > phydev->adjust_link(phydev->attached_dev); > break; > } > -@@ -973,7 +974,8 @@ void phy_state_machine(struct work_struc > +@@ -985,7 +986,8 @@ void phy_state_machine(struct work_struc > netif_carrier_on(phydev->attached_dev); > } else { > phydev->state = PHY_NOLINK; > @@ -31,7 +31,7 @@ Signed-off-by: John Crispin <blo...@openwrt.org> > } > > phydev->adjust_link(phydev->attached_dev); > -@@ -985,7 +987,8 @@ void phy_state_machine(struct work_struc > +@@ -997,7 +999,8 @@ void phy_state_machine(struct work_struc > case PHY_HALTED: > if (phydev->link) { > phydev->link = 0; > diff --git > a/target/linux/mvebu/patches-4.4/125-phy-provide-a-hook-for-link-up-link-down-events.patch > > b/target/linux/mvebu/patches-4.4/125-phy-provide-a-hook-for-link-up-link-down-events.patch > index b009689..75d30f6 100644 > --- > a/target/linux/mvebu/patches-4.4/125-phy-provide-a-hook-for-link-up-link-down-events.patch > +++ > b/target/linux/mvebu/patches-4.4/125-phy-provide-a-hook-for-link-up-link-down-events.patch > @@ -22,7 +22,7 @@ Signed-off-by: Russell King <rmk+ker...@arm.linux.org.uk> > > --- a/drivers/net/phy/phy.c > +++ b/drivers/net/phy/phy.c > -@@ -849,6 +849,16 @@ void phy_start(struct phy_device *phydev > +@@ -852,6 +852,16 @@ void phy_start(struct phy_device *phydev > } > EXPORT_SYMBOL(phy_start); > > @@ -39,7 +39,7 @@ Signed-off-by: Russell King <rmk+ker...@arm.linux.org.uk> > /** > * phy_state_machine - Handle the state machine > * @work: work_struct that describes the work to be done > -@@ -890,8 +900,7 @@ void phy_state_machine(struct work_struc > +@@ -893,8 +903,7 @@ void phy_state_machine(struct work_struc > /* If the link is down, give up on negotiation for now */ > if (!phydev->link) { > phydev->state = PHY_NOLINK; > @@ -49,7 +49,7 @@ Signed-off-by: Russell King <rmk+ker...@arm.linux.org.uk> > break; > } > > -@@ -903,9 +912,7 @@ void phy_state_machine(struct work_struc > +@@ -906,9 +915,7 @@ void phy_state_machine(struct work_struc > /* If AN is done, we're running */ > if (err > 0) { > phydev->state = PHY_RUNNING; > @@ -60,7 +60,7 @@ Signed-off-by: Russell King <rmk+ker...@arm.linux.org.uk> > } else if (0 == phydev->link_timeout--) > needs_aneg = true; > break; > -@@ -930,8 +937,7 @@ void phy_state_machine(struct work_struc > +@@ -933,8 +940,7 @@ void phy_state_machine(struct work_struc > } > } > phydev->state = PHY_RUNNING; > @@ -70,7 +70,7 @@ Signed-off-by: Russell King <rmk+ker...@arm.linux.org.uk> > } > break; > case PHY_FORCING: > -@@ -941,13 +947,12 @@ void phy_state_machine(struct work_struc > +@@ -944,13 +950,12 @@ void phy_state_machine(struct work_struc > > if (phydev->link) { > phydev->state = PHY_RUNNING; > @@ -86,7 +86,7 @@ Signed-off-by: Russell King <rmk+ker...@arm.linux.org.uk> > break; > case PHY_RUNNING: > /* Only register a CHANGE if we are polling or ignoring > -@@ -970,14 +975,12 @@ void phy_state_machine(struct work_struc > +@@ -982,14 +987,12 @@ void phy_state_machine(struct work_struc > > if (phydev->link) { > phydev->state = PHY_RUNNING; > @@ -103,7 +103,7 @@ Signed-off-by: Russell King <rmk+ker...@arm.linux.org.uk> > if (phy_interrupt_is_valid(phydev)) > err = phy_config_interrupt(phydev, > PHY_INTERRUPT_ENABLED); > -@@ -985,8 +988,7 @@ void phy_state_machine(struct work_struc > +@@ -997,8 +1000,7 @@ void phy_state_machine(struct work_struc > case PHY_HALTED: > if (phydev->link) { > phydev->link = 0; > @@ -113,7 +113,7 @@ Signed-off-by: Russell King <rmk+ker...@arm.linux.org.uk> > do_suspend = true; > } > break; > -@@ -1006,11 +1008,11 @@ void phy_state_machine(struct work_struc > +@@ -1018,11 +1020,11 @@ void phy_state_machine(struct work_struc > > if (phydev->link) { > phydev->state = PHY_RUNNING; > @@ -127,7 +127,7 @@ Signed-off-by: Russell King <rmk+ker...@arm.linux.org.uk> > } else { > phydev->state = PHY_AN; > phydev->link_timeout = PHY_AN_TIMEOUT; > -@@ -1022,11 +1024,11 @@ void phy_state_machine(struct work_struc > +@@ -1034,11 +1036,11 @@ void phy_state_machine(struct work_struc > > if (phydev->link) { > phydev->state = PHY_RUNNING; > diff --git > a/target/linux/mvebu/patches-4.4/128-phy-export-phy_speed_to_str-for-phylink.patch > > b/target/linux/mvebu/patches-4.4/128-phy-export-phy_speed_to_str-for-phylink.patch > index c436070..1b79259 100644 > --- > a/target/linux/mvebu/patches-4.4/128-phy-export-phy_speed_to_str-for-phylink.patch > +++ > b/target/linux/mvebu/patches-4.4/128-phy-export-phy_speed_to_str-for-phylink.patch > @@ -34,7 +34,7 @@ Signed-off-by: Russell King <rmk+ker...@arm.linux.org.uk> > case PHY_##_state: \ > --- a/include/linux/phy.h > +++ b/include/linux/phy.h > -@@ -812,6 +812,7 @@ int phy_ethtool_gset(struct phy_device * > +@@ -816,6 +816,7 @@ int phy_ethtool_gset(struct phy_device * > int phy_ethtool_ioctl(struct phy_device *phydev, void *useraddr); > int phy_mii_ioctl(struct phy_device *phydev, struct ifreq *ifr, int cmd); > int phy_start_interrupts(struct phy_device *phydev); > -- > 2.7.4 > > > _______________________________________________ > Lede-dev mailing list > Lede-dev@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/lede-dev _______________________________________________ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev