Skip to content

Commit

Permalink
[bot] AutoMerging: merge all upstream's changes:
Browse files Browse the repository at this point in the history 
* https://github.com/coolsnowwolf/lede:
  kernel: bump 5.18 to 5.18.15 (coolsnowwolf#9859)
  kernel: bump 5.15 to 5.15.58 (coolsnowwolf#9860)
  • Loading branch information
@github-actions
github-actions[bot] committed Jul 30, 2022
2 parents 44bafd9 + d8e3416 commit d21b381
Show file tree
Hide file tree
Showing 10 changed files with 27 additions and 27 deletions.
4 changes: 2 additions & 2 deletions include/kernel-5.15
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
LINUX_VERSION-5.15 = .57
LINUX_KERNEL_HASH-5.15.57 = 62e3095a1fc876315150c93aad1546cc198e3ba5863b3d7ff7da21fbee20f0fd
LINUX_VERSION-5.15 = .58
LINUX_KERNEL_HASH-5.15.58 = d75bd9579c4b318e6162e21c591878fd37efda0f79c5cdd0dc4eb9ea9dfc4fa8
4 changes: 2 additions & 2 deletions include/kernel-5.18
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
LINUX_VERSION-5.18 = .14
LINUX_KERNEL_HASH-5.18.14 = e17d46451133d3a3099b09e200839e875100b48403171923ab71b6a9b39856af
LINUX_VERSION-5.18 = .15
LINUX_KERNEL_HASH-5.18.15 = 69804febdc388a69dfb64493b7b58d402853de3a14144ea8db7fd67c30dcbe3c
2 changes: 1 addition & 1 deletion target/linux/ath79/patches-5.15/910-unaligned_access_hacks.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -706,7 +706,7 @@
EXPORT_SYMBOL(xfrm_parse_spi);
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -4133,14 +4133,16 @@ static bool tcp_parse_aligned_timestamp(
@@ -4138,14 +4138,16 @@ static bool tcp_parse_aligned_timestamp(
{
const __be32 *ptr = (const __be32 *)(th + 1);

Expand Down
4 changes: 2 additions & 2 deletions target/linux/generic/hack-5.15/721-net-add-packet-mangeling.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
*/
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -2771,6 +2771,10 @@ static inline int pskb_trim(struct sk_bu
@@ -2816,6 +2816,10 @@ static inline int pskb_trim(struct sk_bu
return (len < skb->len) ? __pskb_trim(skb, len) : 0;
}

Expand All @@ -82,7 +82,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
/**
* pskb_trim_unique - remove end from a paged unique (not cloned) buffer
* @skb: buffer to alter
@@ -2921,16 +2925,6 @@ static inline struct sk_buff *dev_alloc_
@@ -2966,16 +2970,6 @@ static inline struct sk_buff *dev_alloc_
}


Expand Down
8 changes: 4 additions & 4 deletions target/linux/generic/hack-5.15/760-net-usb-r8152-add-LED-configuration-from-OF.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Signed-off-by: David Bauer <[email protected]>
#include <linux/crc32.h>
#include <linux/if_vlan.h>
#include <linux/uaccess.h>
@@ -6852,6 +6853,22 @@ static void rtl_tally_reset(struct r8152
@@ -6864,6 +6865,22 @@ static void rtl_tally_reset(struct r8152
ocp_write_word(tp, MCU_TYPE_PLA, PLA_RSTTALLY, ocp_data);
}

Expand All @@ -45,7 +45,7 @@ Signed-off-by: David Bauer <[email protected]>
static void r8152b_init(struct r8152 *tp)
{
u32 ocp_data;
@@ -6893,6 +6910,8 @@ static void r8152b_init(struct r8152 *tp
@@ -6905,6 +6922,8 @@ static void r8152b_init(struct r8152 *tp
ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_USB_CTRL);
ocp_data &= ~(RX_AGG_DISABLE | RX_ZERO_EN);
ocp_write_word(tp, MCU_TYPE_USB, USB_USB_CTRL, ocp_data);
Expand All @@ -54,7 +54,7 @@ Signed-off-by: David Bauer <[email protected]>
}

static void r8153_init(struct r8152 *tp)
@@ -7033,6 +7052,8 @@ static void r8153_init(struct r8152 *tp)
@@ -7045,6 +7064,8 @@ static void r8153_init(struct r8152 *tp)
tp->coalesce = COALESCE_SLOW;
break;
}
Expand All @@ -63,7 +63,7 @@ Signed-off-by: David Bauer <[email protected]>
}

static void r8153b_init(struct r8152 *tp)
@@ -7115,6 +7136,8 @@ static void r8153b_init(struct r8152 *tp
@@ -7127,6 +7148,8 @@ static void r8153b_init(struct r8152 *tp
rtl_tally_reset(tp);

tp->coalesce = 15000; /* 15 us */
Expand Down
8 changes: 4 additions & 4 deletions target/linux/generic/hack-5.15/953-net-patch-linux-kernel-to-support-shortcut-fe.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
struct list_head *br_ip_list);
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -877,6 +877,10 @@ struct sk_buff {
@@ -912,6 +912,10 @@ struct sk_buff {
#endif
__u8 slow_gro:1;

Expand Down Expand Up @@ -111,7 +111,7 @@

#ifdef CONFIG_ETHERNET_PACKET_MANGLE
if (dev->eth_mangle_tx && !(skb = dev->eth_mangle_tx(dev, skb)))
@@ -5213,6 +5221,11 @@ void netdev_rx_handler_unregister(struct
@@ -5214,6 +5222,11 @@ void netdev_rx_handler_unregister(struct
}
EXPORT_SYMBOL_GPL(netdev_rx_handler_unregister);

Expand All @@ -123,7 +123,7 @@
/*
* Limit the use of PFMEMALLOC reserves to those protocols that implement
* the special handling of PFMEMALLOC skbs.
@@ -5261,6 +5274,10 @@ static int __netif_receive_skb_core(stru
@@ -5262,6 +5275,10 @@ static int __netif_receive_skb_core(stru
int ret = NET_RX_DROP;
__be16 type;

Expand All @@ -134,7 +134,7 @@
net_timestamp_check(!netdev_tstamp_prequeue, skb);

trace_netif_receive_skb(skb);
@@ -5298,6 +5315,15 @@ another_round:
@@ -5299,6 +5316,15 @@ another_round:
goto out;
}

Expand Down
8 changes: 4 additions & 4 deletions target/linux/generic/hack-5.18/760-net-usb-r8152-add-LED-configuration-from-OF.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Signed-off-by: David Bauer <[email protected]>
#include <linux/crc32.h>
#include <linux/if_vlan.h>
#include <linux/uaccess.h>
@@ -6852,6 +6853,22 @@ static void rtl_tally_reset(struct r8152
@@ -6864,6 +6865,22 @@ static void rtl_tally_reset(struct r8152
ocp_write_word(tp, MCU_TYPE_PLA, PLA_RSTTALLY, ocp_data);
}

Expand All @@ -45,7 +45,7 @@ Signed-off-by: David Bauer <[email protected]>
static void r8152b_init(struct r8152 *tp)
{
u32 ocp_data;
@@ -6893,6 +6910,8 @@ static void r8152b_init(struct r8152 *tp
@@ -6905,6 +6922,8 @@ static void r8152b_init(struct r8152 *tp
ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_USB_CTRL);
ocp_data &= ~(RX_AGG_DISABLE | RX_ZERO_EN);
ocp_write_word(tp, MCU_TYPE_USB, USB_USB_CTRL, ocp_data);
Expand All @@ -54,7 +54,7 @@ Signed-off-by: David Bauer <[email protected]>
}

static void r8153_init(struct r8152 *tp)
@@ -7033,6 +7052,8 @@ static void r8153_init(struct r8152 *tp)
@@ -7045,6 +7064,8 @@ static void r8153_init(struct r8152 *tp)
tp->coalesce = COALESCE_SLOW;
break;
}
Expand All @@ -63,7 +63,7 @@ Signed-off-by: David Bauer <[email protected]>
}

static void r8153b_init(struct r8152 *tp)
@@ -7115,6 +7136,8 @@ static void r8153b_init(struct r8152 *tp
@@ -7127,6 +7148,8 @@ static void r8153b_init(struct r8152 *tp
rtl_tally_reset(tp);

tp->coalesce = 15000; /* 15 us */
Expand Down
2 changes: 1 addition & 1 deletion target/linux/generic/pending-5.15/655-increase_skb_pad.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Signed-off-by: Felix Fietkau <[email protected]>

--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -2737,7 +2737,7 @@ static inline int pskb_network_may_pull(
@@ -2782,7 +2782,7 @@ static inline int pskb_network_may_pull(
* NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
*/
#ifndef NET_SKB_PAD
Expand Down
12 changes: 6 additions & 6 deletions target/linux/generic/pending-5.15/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
#endif
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -855,6 +855,7 @@ struct sk_buff {
@@ -890,6 +890,7 @@ struct sk_buff {
#ifdef CONFIG_IPV6_NDISC_NODETYPE
__u8 ndisc_nodetype:2;
#endif
Expand All @@ -32,7 +32,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
__u8 inner_protocol_type:1;
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -6061,6 +6061,9 @@ static enum gro_result dev_gro_receive(s
@@ -6062,6 +6062,9 @@ static enum gro_result dev_gro_receive(s
int same_flow;
int grow;

Expand All @@ -42,7 +42,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
if (netif_elide_gro(skb->dev))
goto normal;

@@ -8075,6 +8078,48 @@ static void __netdev_adjacent_dev_unlink
@@ -8076,6 +8079,48 @@ static void __netdev_adjacent_dev_unlink
&upper_dev->adj_list.lower);
}

Expand Down Expand Up @@ -91,23 +91,23 @@ Signed-off-by: Felix Fietkau <[email protected]>
static int __netdev_upper_dev_link(struct net_device *dev,
struct net_device *upper_dev, bool master,
void *upper_priv, void *upper_info,
@@ -8126,6 +8171,7 @@ static int __netdev_upper_dev_link(struc
@@ -8127,6 +8172,7 @@ static int __netdev_upper_dev_link(struc
if (ret)
return ret;

+ netdev_update_addr_mask(dev);
ret = call_netdevice_notifiers_info(NETDEV_CHANGEUPPER,
&changeupper_info.info);
ret = notifier_to_errno(ret);
@@ -8222,6 +8268,7 @@ static void __netdev_upper_dev_unlink(st
@@ -8223,6 +8269,7 @@ static void __netdev_upper_dev_unlink(st

__netdev_adjacent_dev_unlink_neighbour(dev, upper_dev);

+ netdev_update_addr_mask(dev);
call_netdevice_notifiers_info(NETDEV_CHANGEUPPER,
&changeupper_info.info);

@@ -9041,6 +9088,7 @@ int dev_set_mac_address(struct net_devic
@@ -9042,6 +9089,7 @@ int dev_set_mac_address(struct net_devic
if (err)
return err;
dev->addr_assign_type = NET_ADDR_SET;
Expand Down
2 changes: 1 addition & 1 deletion .../linux/rockchip/patches-5.15/205-rockchip-rk3399-Add-support-for-EmbedFire-DoorNet2.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -782,7 +782,7 @@

--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -2907,6 +2907,8 @@ static int stmmac_init_dma_engine(struct
@@ -2898,6 +2898,8 @@ static int stmmac_init_dma_engine(struct
if (priv->extend_desc && (priv->mode == STMMAC_RING_MODE))
atds = 1;

Expand Down

0 comments on commit d21b381

Please sign in to comment.