|
@@ -927,7 +927,7 @@ static int sh_eth_start_xmit(struct sk_buff *skb, struct net_device *ndev)
|
|
|
struct sh_eth_private *mdp = netdev_priv(ndev);
|
|
|
struct sh_eth_txdesc *txdesc;
|
|
|
u32 entry;
|
|
|
- int flags;
|
|
|
+ unsigned long flags;
|
|
|
|
|
|
spin_lock_irqsave(&mdp->lock, flags);
|
|
|
if ((mdp->cur_tx - mdp->dirty_tx) >= (TX_RING_SIZE - 4)) {
|
|
@@ -1141,7 +1141,7 @@ static int sh_mdio_init(struct net_device *ndev, int id)
|
|
|
/* Hook up MII support for ethtool */
|
|
|
mdp->mii_bus->name = "sh_mii";
|
|
|
mdp->mii_bus->parent = &ndev->dev;
|
|
|
- mdp->mii_bus->id[0] = id;
|
|
|
+ snprintf(mdp->mii_bus->id, MII_BUS_ID_SIZE, "%x", id);
|
|
|
|
|
|
/* PHY IRQ */
|
|
|
mdp->mii_bus->irq = kmalloc(sizeof(int)*PHY_MAX_ADDR, GFP_KERNEL);
|