ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-19 05:38:00 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

ath79: fix ethernet driver build errors on kernel 6.1

Browse Source 
Some net APIs have changed on the new kernel. Update them to fix
compile errors.

Signed-off-by: Shiji Yang <yangshiji66@qq.com>
This commit is contained in:
Shiji Yang 2023-05-25 18:35:20 +08:00 committed by David Bauer
parent 5f59d28bc3
commit 7189b45784
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
target/linux/ath79/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_ethtool.c
View File

@ -80,8 +80,15 @@ static void ag71xx_ethtool_set_msglevel(struct net_device *dev, u32 msg_level)
ag->msg_enable = msg_level;
}
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,17,0)
static void ag71xx_ethtool_get_ringparam(struct net_device *dev,
struct ethtool_ringparam *er,
struct kernel_ethtool_ringparam *kernel_ring,
struct netlink_ext_ack *extack)
#else
static void ag71xx_ethtool_get_ringparam(struct net_device *dev,
struct ethtool_ringparam *er)
#endif
{
struct ag71xx *ag = netdev_priv(dev);
@ -99,8 +106,15 @@ static void ag71xx_ethtool_get_ringparam(struct net_device *dev,
er->tx_pending /= AG71XX_TX_RING_DS_PER_PKT;
}
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,17,0)
static int ag71xx_ethtool_set_ringparam(struct net_device *dev,
struct ethtool_ringparam *er,
struct kernel_ethtool_ringparam *kernel_ring,
struct netlink_ext_ack *extack)
#else
static int ag71xx_ethtool_set_ringparam(struct net_device *dev,
struct ethtool_ringparam *er)
#endif
{
struct ag71xx *ag = netdev_priv(dev);
unsigned tx_size;

13
target/linux/ath79/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c
View File

@ -333,7 +333,7 @@ static unsigned char *ag71xx_speed_str(struct ag71xx *ag)
return "?";
}
static void ag71xx_hw_set_macaddr(struct ag71xx *ag, unsigned char *mac)
static void ag71xx_hw_set_macaddr(struct ag71xx *ag, const unsigned char *mac)
{
u32 t;
@ -1166,7 +1166,7 @@ static int ag71xx_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
switch (cmd) {
case SIOCSIFHWADDR:
if (copy_from_user
(dev->dev_addr, ifr->ifr_data, sizeof(dev->dev_addr)))
((void*)dev->dev_addr, ifr->ifr_data, sizeof(dev->dev_addr)))
return -EFAULT;
return 0;
@ -1669,10 +1669,9 @@ static int ag71xx_probe(struct platform_device *pdev)
ag->stop_desc->ctrl = 0;
ag->stop_desc->next = (u32) ag->stop_desc_dma;
of_get_mac_address(np, dev->dev_addr);
if (!is_valid_ether_addr(dev->dev_addr)) {
if (of_get_ethdev_address(np, dev)) {
dev_err(&pdev->dev, "invalid MAC address, using random address\n");
eth_random_addr(dev->dev_addr);
eth_hw_addr_random(dev);
}
err = of_get_phy_mode(np, &ag->phy_if_mode);
@ -1699,7 +1698,11 @@ static int ag71xx_probe(struct platform_device *pdev)
break;
}
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,19,0)
netif_napi_add_weight(dev, &ag->napi, ag71xx_poll, AG71XX_NAPI_WEIGHT);
#else
netif_napi_add(dev, &ag->napi, ag71xx_poll, AG71XX_NAPI_WEIGHT);
#endif
ag71xx_dump_regs(ag);