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

sh: sh_eth: Update to change of mii_bus

Update to change of mii_bus interface and fix some warning.

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by Nobuhiro Iwamatsu and committed by David S. Miller fb5e2f9b c8283845

+2 -2
unified split
+2 -2
drivers/net/sh_eth.c
··· 927 struct sh_eth_private *mdp = netdev_priv(ndev); 928 struct sh_eth_txdesc *txdesc; 929 u32 entry; 930 - int flags; 931 932 spin_lock_irqsave(&mdp->lock, flags); 933 if ((mdp->cur_tx - mdp->dirty_tx) >= (TX_RING_SIZE - 4)) { ··· 1141 /* Hook up MII support for ethtool */ 1142 mdp->mii_bus->name = "sh_mii"; 1143 mdp->mii_bus->parent = &ndev->dev; 1144 - mdp->mii_bus->id[0] = id; 1145 1146 /* PHY IRQ */ 1147 mdp->mii_bus->irq = kmalloc(sizeof(int)*PHY_MAX_ADDR, GFP_KERNEL);
··· 927 struct sh_eth_private *mdp = netdev_priv(ndev); 928 struct sh_eth_txdesc *txdesc; 929 u32 entry; 930 + unsigned long flags; 931 932 spin_lock_irqsave(&mdp->lock, flags); 933 if ((mdp->cur_tx - mdp->dirty_tx) >= (TX_RING_SIZE - 4)) { ··· 1141 /* Hook up MII support for ethtool */ 1142 mdp->mii_bus->name = "sh_mii"; 1143 mdp->mii_bus->parent = &ndev->dev; 1144 + snprintf(mdp->mii_bus->id, MII_BUS_ID_SIZE, "%x", id); 1145 1146 /* PHY IRQ */ 1147 mdp->mii_bus->irq = kmalloc(sizeof(int)*PHY_MAX_ADDR, GFP_KERNEL);