From 35aa759b185d1e294a543ae98df3684321856c96 Mon Sep 17 00:00:00 2001 From: Auke Kok Date: Thu, 31 Aug 2006 14:27:50 -0700 Subject: [PATCH] --- yaml --- r: 35213 b: refs/heads/master c: f990b426afb2f6ed77ba9ec272bdfe3d5d3a3d39 h: refs/heads/master i: 35211: 69698b82b870870dc530ee1d5cc0471879484aaa v: v3 --- [refs] | 2 +- trunk/drivers/net/ixgb/ixgb_main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b7d23a83cc75..bc246152ad30 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5791704fbe6e1a23de29332e18840f8c90faf601 +refs/heads/master: f990b426afb2f6ed77ba9ec272bdfe3d5d3a3d39 diff --git a/trunk/drivers/net/ixgb/ixgb_main.c b/trunk/drivers/net/ixgb/ixgb_main.c index 6959735d4eba..fee4c5aac31b 100644 --- a/trunk/drivers/net/ixgb/ixgb_main.c +++ b/trunk/drivers/net/ixgb/ixgb_main.c @@ -2190,7 +2190,7 @@ ixgb_restore_vlan(struct ixgb_adapter *adapter) static void ixgb_netpoll(struct net_device *dev) { - struct ixgb_adapter *adapter = dev->priv; + struct ixgb_adapter *adapter = netdev_priv(dev); disable_irq(adapter->pdev->irq); ixgb_intr(adapter->pdev->irq, dev, NULL);