Skip to content

Commit

Permalink
kernel: bump 5.4 to 5.4.275 (#12128)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Beginner-Go
Beginner-Go authored May 4, 2024
1 parent e5c26e9 commit 23a35d1
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 16 deletions.
4 changes: 2 additions & 2 deletions include/kernel-5.4
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
LINUX_VERSION-5.4 = .274
LINUX_KERNEL_HASH-5.4.274 = eac7b421a43cd46a3dbebf7c85d075faa7e164d80d215d31fcd35544b6f79ed4
LINUX_VERSION-5.4 = .275
LINUX_KERNEL_HASH-5.4.275 = dad2b068946f0ca0026130d7ab17601d5074d90b381379c4479314d4edf4304c
6 changes: 3 additions & 3 deletions target/linux/bcm47xx/patches-5.4/209-b44-register-adm-switch.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Subject: [PATCH 210/210] b44: register adm switch

#include <linux/uaccess.h>
#include <asm/io.h>
@@ -2249,6 +2251,69 @@ static void b44_adjust_link(struct net_d
@@ -2251,6 +2253,69 @@ static void b44_adjust_link(struct net_d
}
}

Expand Down Expand Up @@ -89,7 +89,7 @@ Subject: [PATCH 210/210] b44: register adm switch
static int b44_register_phy_one(struct b44 *bp)
{
__ETHTOOL_DECLARE_LINK_MODE_MASK(mask) = { 0, };
@@ -2285,6 +2350,9 @@ static int b44_register_phy_one(struct b
@@ -2287,6 +2352,9 @@ static int b44_register_phy_one(struct b
if (!mdiobus_is_registered_device(bp->mii_bus, bp->phy_addr) &&
(sprom->boardflags_lo & (B44_BOARDFLAG_ROBO | B44_BOARDFLAG_ADM))) {

Expand All @@ -99,7 +99,7 @@ Subject: [PATCH 210/210] b44: register adm switch
dev_info(sdev->dev,
"could not find PHY at %i, use fixed one\n",
bp->phy_addr);
@@ -2481,6 +2549,7 @@ static void b44_remove_one(struct ssb_de
@@ -2483,6 +2551,7 @@ static void b44_remove_one(struct ssb_de
unregister_netdev(dev);
if (bp->flags & B44_FLAG_EXTERNAL_PHY)
b44_unregister_phy_one(bp);
Expand Down
2 changes: 1 addition & 1 deletion target/linux/bcm47xx/patches-5.4/210-b44_phy_fix.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@

if (bp->flags & B44_FLAG_EXTERNAL_PHY)
return 0;
@@ -2179,6 +2204,8 @@ static int b44_get_invariants(struct b44
@@ -2181,6 +2206,8 @@ static int b44_get_invariants(struct b44
* valid PHY address. */
bp->phy_addr &= 0x1F;

Expand Down
2 changes: 1 addition & 1 deletion ...eneric/backport-5.4/782-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1775,7 +1775,7 @@ Signed-off-by: David S. Miller <[email protected]>
eth_hw_addr_inherit(slave_dev, master);
--- a/net/ethernet/eth.c
+++ b/net/ethernet/eth.c
@@ -550,13 +550,14 @@ unsigned char * __weak arch_get_platform
@@ -540,13 +540,14 @@ unsigned char * __weak arch_get_platform

int eth_platform_get_mac_address(struct device *dev, u8 *mac_addr)
{
Expand Down
4 changes: 2 additions & 2 deletions target/linux/generic/hack-5.4/995-usb-serial-option-add-ec200a.patch
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -278,6 +278,7 @@ static void option_instat_callback(struc
@@ -282,6 +282,7 @@ static void option_instat_callback(struc
#define QUECTEL_PRODUCT_EM061K_LWW 0x6008
#define QUECTEL_PRODUCT_EM061K_LCN 0x6009
#define QUECTEL_PRODUCT_EC200T 0x6026
+#define QUECTEL_PRODUCT_EC200A_CN 0x6005
#define QUECTEL_PRODUCT_RM500K 0x7001

#define CMOTECH_VENDOR_ID 0x16d8
@@ -1251,6 +1252,7 @@ static const struct usb_device_id option
@@ -1267,6 +1268,7 @@ static const struct usb_device_id option
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC200U, 0xff, 0, 0) },
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC200S_CN, 0xff, 0, 0) },
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC200T, 0xff, 0, 0) },
Expand Down
6 changes: 3 additions & 3 deletions .../linux/generic/pending-5.4/640-netfilter-nf_flow_table-add-hardware-offload-support.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,7 @@ Signed-off-by: Pablo Neira Ayuso <[email protected]>
+MODULE_ALIAS("nf-flow-table-hw");
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -6041,6 +6041,13 @@ static int nf_tables_flowtable_parse_hoo
@@ -6045,6 +6045,13 @@ static int nf_tables_flowtable_parse_hoo
if (err < 0)
return err;

Expand All @@ -520,7 +520,7 @@ Signed-off-by: Pablo Neira Ayuso <[email protected]>
ops = kcalloc(n, sizeof(struct nf_hook_ops), GFP_KERNEL);
if (!ops)
return -ENOMEM;
@@ -6190,10 +6197,19 @@ static int nf_tables_newflowtable(struct
@@ -6194,10 +6201,19 @@ static int nf_tables_newflowtable(struct
}

flowtable->data.type = type;
Expand All @@ -540,7 +540,7 @@ Signed-off-by: Pablo Neira Ayuso <[email protected]>
err = nf_tables_flowtable_parse_hook(&ctx, nla[NFTA_FLOWTABLE_HOOK],
flowtable);
if (err < 0)
@@ -6319,7 +6335,8 @@ static int nf_tables_fill_flowtable_info
@@ -6323,7 +6339,8 @@ static int nf_tables_fill_flowtable_info
nla_put_string(skb, NFTA_FLOWTABLE_NAME, flowtable->name) ||
nla_put_be32(skb, NFTA_FLOWTABLE_USE, htonl(flowtable->use)) ||
nla_put_be64(skb, NFTA_FLOWTABLE_HANDLE, cpu_to_be64(flowtable->handle),
Expand Down
8 changes: 4 additions & 4 deletions target/linux/generic/pending-5.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,14 +136,14 @@ Signed-off-by: Felix Fietkau <[email protected]>
/**
* eth_type_trans - determine the packet's protocol ID.
* @skb: received socket data
@@ -174,6 +186,10 @@ __be16 eth_type_trans(struct sk_buff *sk
} else {
skb->pkt_type = PACKET_OTHERHOST;
@@ -470,6 +482,10 @@ struct sk_buff *eth_gro_receive(struct l
NAPI_GRO_CB(p)->same_flow = 0;
continue;
}
+
+ if (eth_check_local_mask(eth->h_dest, dev->dev_addr,
+ dev->local_addr_mask))
+ skb->gro_skip = 1;
}

/*
type = eh->h_proto;

3 comments on commit 23a35d1

@qwerttvv
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://github.com/qwerttvv/Router/actions/runs/8955476730/job/24596211721#step:13:110

make[5]: Entering directory '/workdir/openwrt/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7621/linux-5.4.275'
  CALL    scripts/checksyscalls.sh
  CALL    scripts/atomic/check-atomics.sh
  CHK     include/generated/compile.h
  CC      net/ethernet/eth.o
net/ethernet/eth.c: In function 'eth_gro_receive':
net/ethernet/eth.c:492:28: error: 'eth' undeclared (first use in this function); did you mean 'eh'?
   if (eth_check_local_mask(eth->h_dest, dev->dev_addr,
                            ^~~
                            eh
net/ethernet/eth.c:492:28: note: each undeclared identifier is reported only once for each function it appears in
net/ethernet/eth.c:492:41: error: 'dev' undeclared (first use in this function); did you mean 'cdev'?
   if (eth_check_local_mask(eth->h_dest, dev->dev_addr,
                                         ^~~
                                         cdev
make[7]: *** [scripts/Makefile.build:262: net/ethernet/eth.o] Error 1
make[6]: *** [scripts/Makefile.build:497: net/ethernet] Error 2
make[5]: *** [Makefile:1750: net] Error 2
make[5]: Leaving directory '/workdir/openwrt/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7621/linux-5.4.275'
make[4]: *** [Makefile:25: /workdir/openwrt/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7621/linux-5.4.275/.modules] Error 2

@WYC-2020
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image
把别人要打path的函数都搞错了，能不错么,用这个patch @qwerttvv
680-NET-skip-GRO-for-foreign-MAC-addresses.patch

@qwerttvv
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image 把别人要打path的函数都搞错了，能不错么,用这个patch @qwerttvv 680-NET-skip-GRO-for-foreign-MAC-addresses.patch

cool,多谢

Please sign in to comment.