Skip to content

Commit 047521d

Browse files
hkallweitdavem330
authored andcommitted
r8169: let rtl8169_mark_to_asic clear rx descriptor field opts2
Clearing opts2 belongs to preparing the descriptor for DMA engine use. Therefore move it into rtl8169_mark_to_asic(). Signed-off-by: Heiner Kallweit <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 6ee2425 commit 047521d

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/net/ethernet/realtek/r8169_main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3889,6 +3889,7 @@ static inline void rtl8169_mark_to_asic(struct RxDesc *desc)
38893889
{
38903890
u32 eor = le32_to_cpu(desc->opts1) & RingEnd;
38913891

3892+
desc->opts2 = 0;
38923893
/* Force memory writes to complete before releasing descriptor */
38933894
dma_wmb();
38943895

@@ -4543,7 +4544,6 @@ static int rtl_rx(struct net_device *dev, struct rtl8169_private *tp, u32 budget
45434544
u64_stats_update_end(&tp->rx_stats.syncp);
45444545
}
45454546
release_descriptor:
4546-
desc->opts2 = 0;
45474547
rtl8169_mark_to_asic(desc);
45484548
}
45494549

0 commit comments

Comments
 (0)