From: Kevin Hao <kexin....@windriver.com>
This is a change introduced by stable commit 8025fd0706c8 ("net:
axienet: Fix check for partial TX checksum"), and it was overrode by
merge commit b7ed6a246663 ("Merge branch 'v6.1/standard/base' into
v6.1/standard/sdkv6.1/xlnx-soc"). Restore it back.
Signed-off-by: Kevin Hao <kexin....@windriver.com>
---
Hi Bruce,
Please help me merge this into the following two branches.
v6.1/standard/sdkv6.1/xlnx-soc
v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc
drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
index c0365a5a8f42..b4838d9d5177 100644
--- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
+++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
@@ -1320,7 +1320,7 @@ static int axienet_queue_xmit(struct sk_buff *skb,
if (lp->features & XAE_FEATURE_FULL_TX_CSUM) {
/* Tx Full Checksum Offload Enabled */
cur_p->app0 |= 2;
- } else if (lp->features & XAE_FEATURE_PARTIAL_RX_CSUM) {
+ } else if (lp->features & XAE_FEATURE_PARTIAL_TX_CSUM) {
csum_start_off = skb_transport_offset(skb);
csum_index_off = csum_start_off + skb->csum_offset;
/* Tx Partial Checksum Offload Enabled */
--
2.39.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#13358):
https://lists.yoctoproject.org/g/linux-yocto/message/13358
Mute This Topic: https://lists.yoctoproject.org/mt/102967146/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
