merged. Bruce
In message: [linux-yocto] net: axienet: Fix check for partial TX checksum on 04/12/2023 Kevin Hao wrote: > From: Kevin Hao <[email protected]> > > This is a change introduced by stable commit 6aeac88a45de ("net: > axienet: Fix check for partial TX checksum"), and it was overrode by > merge commit 4ada1b0800dc ("Merge branch 'v5.15/standard/base' into > v5.15/standard/sdkv5.15/xlnx-soc"). Restore it back. > > Signed-off-by: Kevin Hao <[email protected]> > --- > Hi Bruce, > > Could you help me merge this into the following two branches? > v5.15/standard/sdkv5.15/xlnx-soc > v5.15/standard/preempt-rt/sdkv5.15/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 a259cdce2243..ad31c2fb7888 100644 > --- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c > +++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c > @@ -1376,7 +1376,7 @@ 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 (#13365): https://lists.yoctoproject.org/g/linux-yocto/message/13365 Mute This Topic: https://lists.yoctoproject.org/mt/102967146/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/leave/6687884/21656/624485779/xyzzy [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
