aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/packetengines/hamachi.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/ethernet/packetengines/hamachi.c')
-rw-r--r--drivers/net/ethernet/packetengines/hamachi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/packetengines/hamachi.c b/drivers/net/ethernet/packetengines/hamachi.c
index 26bc8b3b1ec8..b0de7e9f12a5 100644
--- a/drivers/net/ethernet/packetengines/hamachi.c
+++ b/drivers/net/ethernet/packetengines/hamachi.c
@@ -1025,7 +1025,7 @@ static inline int hamachi_tx(struct net_device *dev)
static void hamachi_timer(struct timer_list *t)
{
- struct hamachi_private *hmp = from_timer(hmp, t, timer);
+ struct hamachi_private *hmp = timer_container_of(hmp, t, timer);
struct net_device *dev = hmp->mii_if.dev;
void __iomem *ioaddr = hmp->base;
int next_tick = 10*HZ;