diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2024-02-22 16:01:05 +0100 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2024-02-22 16:01:05 +0100 |
| commit | 675b3306545c75cd31ff3f66ae655907d43058d4 (patch) | |
| tree | 500bebb80ec5d8a27cdafcef1f548b6997dfc184 /drivers/net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c | |
| parent | 129f64666834eeb6238a396b1c4ebe275ad7e435 (diff) | |
| parent | 26c690eff0a56293e0b6911a38e406c211b35547 (diff) | |
Merge tag 'v5.15.146' into fslc-5.15-2.2.x-imx
This is the 5.15.146 stable release
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Diffstat (limited to 'drivers/net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c')
| -rw-r--r-- | drivers/net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c index 401fef5f1d07..fc26ffaae620 100644 --- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c +++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c @@ -255,7 +255,7 @@ static void hns_xgmac_pausefrm_cfg(void *mac_drv, u32 rx_en, u32 tx_en) dsaf_write_dev(drv, XGMAC_MAC_PAUSE_CTRL_REG, origin); } -static void hns_xgmac_set_pausefrm_mac_addr(void *mac_drv, char *mac_addr) +static void hns_xgmac_set_pausefrm_mac_addr(void *mac_drv, const char *mac_addr) { struct mac_driver *drv = (struct mac_driver *)mac_drv; |