Nanako/DHDAXCW-Rockchip-OpenWrt
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

kernel: bump 6.1 to 6.1.21

Browse Source
This commit is contained in:
DHDAXCW 2023-03-22 14:13:10 +00:00
parent 36eab4bd94
commit 3f75416411
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/kernel-6.1
View File

@ -1,2 +1,2 @@
LINUX_VERSION-6.1 = .20 LINUX_VERSION-6.1 = .21
LINUX_KERNEL_HASH-6.1.20 = 76322de8c01a3c63b42c4d1e9b9e7d1897ddb91276e10d73d1f9df3562f031f0 LINUX_KERNEL_HASH-6.1.21 = b33cb1b86ae13441db36f7e8099ff9edb10494bfd141b4efb41bc44bf815d93a

6
target/linux/generic/backport-6.1/101-net-Remove-the-obsolte-u64_stats_fetch_-_irq-users-d.patch
View File

@ -157,7 +157,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
stats->tx_dropped = tx_drops; stats->tx_dropped = tx_drops;
--- a/drivers/net/ethernet/aquantia/atlantic/aq_ring.c --- a/drivers/net/ethernet/aquantia/atlantic/aq_ring.c
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_ring.c +++ b/drivers/net/ethernet/aquantia/atlantic/aq_ring.c
@@ -934,7 +934,7 @@ unsigned int aq_ring_fill_stats_data(str @@ -948,7 +948,7 @@ unsigned int aq_ring_fill_stats_data(str
/* This data should mimic aq_ethtool_queue_rx_stat_names structure */ /* This data should mimic aq_ethtool_queue_rx_stat_names structure */
do { do {
count = 0; count = 0;
@ -166,7 +166,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
data[count] = self->stats.rx.packets; data[count] = self->stats.rx.packets;
data[++count] = self->stats.rx.jumbo_packets; data[++count] = self->stats.rx.jumbo_packets;
data[++count] = self->stats.rx.lro_packets; data[++count] = self->stats.rx.lro_packets;
@@ -951,15 +951,15 @@ unsigned int aq_ring_fill_stats_data(str @@ -965,15 +965,15 @@ unsigned int aq_ring_fill_stats_data(str
data[++count] = self->stats.rx.xdp_tx; data[++count] = self->stats.rx.xdp_tx;
data[++count] = self->stats.rx.xdp_invalid; data[++count] = self->stats.rx.xdp_invalid;
data[++count] = self->stats.rx.xdp_redirect; data[++count] = self->stats.rx.xdp_redirect;
@ -785,7 +785,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
*data += size; *data += size;
--- a/drivers/net/ethernet/intel/ice/ice_main.c --- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c +++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@ -6396,10 +6396,10 @@ ice_fetch_u64_stats_per_ring(struct u64_ @@ -6393,10 +6393,10 @@ ice_fetch_u64_stats_per_ring(struct u64_
unsigned int start; unsigned int start;
do { do {

8
target/linux/generic/hack-6.1/721-net-add-packet-mangeling.patch
View File

@ -19,7 +19,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/include/linux/netdevice.h --- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h +++ b/include/linux/netdevice.h
@@ -1702,6 +1702,7 @@ enum netdev_priv_flags { @@ -1704,6 +1704,7 @@ enum netdev_priv_flags {
IFF_LIVE_RENAME_OK = 1<<30, IFF_LIVE_RENAME_OK = 1<<30,
IFF_TX_SKB_NO_LINEAR = BIT_ULL(31), IFF_TX_SKB_NO_LINEAR = BIT_ULL(31),
IFF_CHANGE_PROTO_DOWN = BIT_ULL(32), IFF_CHANGE_PROTO_DOWN = BIT_ULL(32),
@ -27,7 +27,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
}; };
#define IFF_802_1Q_VLAN IFF_802_1Q_VLAN #define IFF_802_1Q_VLAN IFF_802_1Q_VLAN
@@ -1736,6 +1737,7 @@ enum netdev_priv_flags { @@ -1738,6 +1739,7 @@ enum netdev_priv_flags {
#define IFF_L3MDEV_RX_HANDLER IFF_L3MDEV_RX_HANDLER #define IFF_L3MDEV_RX_HANDLER IFF_L3MDEV_RX_HANDLER
#define IFF_LIVE_RENAME_OK IFF_LIVE_RENAME_OK #define IFF_LIVE_RENAME_OK IFF_LIVE_RENAME_OK
#define IFF_TX_SKB_NO_LINEAR IFF_TX_SKB_NO_LINEAR #define IFF_TX_SKB_NO_LINEAR IFF_TX_SKB_NO_LINEAR
@ -35,7 +35,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
/* Specifies the type of the struct net_device::ml_priv pointer */ /* Specifies the type of the struct net_device::ml_priv pointer */
enum netdev_ml_priv_type { enum netdev_ml_priv_type {
@@ -2104,6 +2106,11 @@ struct net_device { @@ -2106,6 +2108,11 @@ struct net_device {
const struct tlsdev_ops *tlsdev_ops; const struct tlsdev_ops *tlsdev_ops;
#endif #endif
@ -47,7 +47,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
const struct header_ops *header_ops; const struct header_ops *header_ops;
unsigned char operstate; unsigned char operstate;
@@ -2179,6 +2186,10 @@ struct net_device { @@ -2181,6 +2188,10 @@ struct net_device {
struct mctp_dev __rcu *mctp_ptr; struct mctp_dev __rcu *mctp_ptr;
#endif #endif

2
target/linux/generic/pending-6.1/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
View File

@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/include/linux/netdevice.h --- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h +++ b/include/linux/netdevice.h
@@ -2131,6 +2131,8 @@ struct net_device { @@ -2133,6 +2133,8 @@ struct net_device {
struct netdev_hw_addr_list mc; struct netdev_hw_addr_list mc;
struct netdev_hw_addr_list dev_addrs; struct netdev_hw_addr_list dev_addrs;

2
target/linux/generic/pending-6.1/731-net-permit-ieee80211_ptr-even-with-no-CFG82111-suppo.patch
View File

@ -17,7 +17,7 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
--- a/include/linux/netdevice.h --- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h +++ b/include/linux/netdevice.h
@@ -2166,7 +2166,7 @@ struct net_device { @@ -2168,7 +2168,7 @@ struct net_device {
#if IS_ENABLED(CONFIG_AX25) #if IS_ENABLED(CONFIG_AX25)
void *ax25_ptr; void *ax25_ptr;
#endif #endif

2
target/linux/generic/pending-6.1/768-net-dsa-mv88e6xxx-Request-assisted-learning-on-CPU-port.patch
View File

@ -17,7 +17,7 @@ Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
--- a/drivers/net/dsa/mv88e6xxx/chip.c --- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -6957,6 +6957,7 @@ static int mv88e6xxx_register_switch(str @@ -6965,6 +6965,7 @@ static int mv88e6xxx_register_switch(str
ds->ops = &mv88e6xxx_switch_ops; ds->ops = &mv88e6xxx_switch_ops;
ds->ageing_time_min = chip->info->age_time_coeff; ds->ageing_time_min = chip->info->age_time_coeff;
ds->ageing_time_max = chip->info->age_time_coeff * U8_MAX; ds->ageing_time_max = chip->info->age_time_coeff * U8_MAX;