diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-29 13:09:40 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-29 13:09:40 +0100 |
| commit | 75329f1f0c0e2e2ad611734a2ef08309391a4d9f (patch) | |
| tree | 67ca1a13f51fbf2f5af8557e6ff0bb722efab3e6 /drivers/net/fec_mpc52xx.c | |
| parent | b6b301aa9fba57b114c3a00f5f43abf672bd4ecd (diff) | |
| parent | 3c92ec8ae91ecf59d88c798301833d7cf83f2179 (diff) | |
Merge branch 'linus' into x86/cleanups
Diffstat (limited to 'drivers/net/fec_mpc52xx.c')
| -rw-r--r-- | drivers/net/fec_mpc52xx.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/fec_mpc52xx.c b/drivers/net/fec_mpc52xx.c index aec3b97e794..cd8e98b45ec 100644 --- a/drivers/net/fec_mpc52xx.c +++ b/drivers/net/fec_mpc52xx.c @@ -216,7 +216,7 @@ static int mpc52xx_fec_init_phy(struct net_device *dev) struct phy_device *phydev; char phy_id[BUS_ID_SIZE]; - snprintf(phy_id, BUS_ID_SIZE, "%x:%02x", + snprintf(phy_id, sizeof(phy_id), "%x:%02x", (unsigned int)dev->base_addr, priv->phy_addr); priv->link = PHY_DOWN; @@ -487,7 +487,6 @@ static irqreturn_t mpc52xx_fec_rx_interrupt(int irq, void *dev_id) rskb->protocol = eth_type_trans(rskb, dev); netif_rx(rskb); - dev->last_rx = jiffies; } else { /* Can't get a new one : reuse the same & drop pkt */ dev_notice(&dev->dev, "Memory squeeze, dropping packet.\n"); |