tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'ravb-fixes'

Yoshihiro Shimoda says:

====================
net: ravb: Fix potential issues

Fix potentiall issues on the ravb driver.

Changes from v2:
https://lore.kernel.org/all/20230123131331.1425648-1-yoshihiro.shimoda.uh@renesas.com/
- Add Reviewed-by in the patch [2/2].
- Add a commit description in the patch [2/2].

Changes from v1:
https://lore.kernel.org/all/20230119043920.875280-1-yoshihiro.shimoda.uh@renesas.com/
- Fix typo in the patch [1/2].
- Add Reviewed-by in the patch [1/2].
- Fix "Fixed" tag in the patch [2/2].
- Fix a comment indentation of the code in the patch [2/2].
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

David S. Miller a9e9b78d f2b0b521

+8 -2
+8 -2
drivers/net/ethernet/renesas/ravb_main.c
··· 1101 1101 ravb_write(ndev, ~(EIS_QFS | EIS_RESERVED), EIS); 1102 1102 if (eis & EIS_QFS) { 1103 1103 ris2 = ravb_read(ndev, RIS2); 1104 - ravb_write(ndev, ~(RIS2_QFF0 | RIS2_RFFF | RIS2_RESERVED), 1104 + ravb_write(ndev, ~(RIS2_QFF0 | RIS2_QFF1 | RIS2_RFFF | RIS2_RESERVED), 1105 1105 RIS2); 1106 1106 1107 1107 /* Receive Descriptor Empty int */ 1108 1108 if (ris2 & RIS2_QFF0) 1109 1109 priv->stats[RAVB_BE].rx_over_errors++; 1110 1110 1111 - /* Receive Descriptor Empty int */ 1111 + /* Receive Descriptor Empty int */ 1112 1112 if (ris2 & RIS2_QFF1) 1113 1113 priv->stats[RAVB_NC].rx_over_errors++; 1114 1114 ··· 2973 2973 else 2974 2974 ret = ravb_close(ndev); 2975 2975 2976 + if (priv->info->ccc_gac) 2977 + ravb_ptp_stop(ndev); 2978 + 2976 2979 return ret; 2977 2980 } 2978 2981 ··· 3013 3010 3014 3011 /* Restore descriptor base address table */ 3015 3012 ravb_write(ndev, priv->desc_bat_dma, DBAT); 3013 + 3014 + if (priv->info->ccc_gac) 3015 + ravb_ptp_init(ndev, priv->pdev); 3016 3016 3017 3017 if (netif_running(ndev)) { 3018 3018 if (priv->wol_enabled) {