diff options
Diffstat (limited to 'drivers/net/ixgb/ixgb_main.c')
-rw-r--r-- | drivers/net/ixgb/ixgb_main.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c index cfde7c2569bb..e09f575a3a38 100644 --- a/drivers/net/ixgb/ixgb_main.c +++ b/drivers/net/ixgb/ixgb_main.c | |||
@@ -93,7 +93,7 @@ static int ixgb_xmit_frame(struct sk_buff *skb, struct net_device *netdev); | |||
93 | static struct net_device_stats *ixgb_get_stats(struct net_device *netdev); | 93 | static struct net_device_stats *ixgb_get_stats(struct net_device *netdev); |
94 | static int ixgb_change_mtu(struct net_device *netdev, int new_mtu); | 94 | static int ixgb_change_mtu(struct net_device *netdev, int new_mtu); |
95 | static int ixgb_set_mac(struct net_device *netdev, void *p); | 95 | static int ixgb_set_mac(struct net_device *netdev, void *p); |
96 | static irqreturn_t ixgb_intr(int irq, void *data, struct pt_regs *regs); | 96 | static irqreturn_t ixgb_intr(int irq, void *data); |
97 | static boolean_t ixgb_clean_tx_irq(struct ixgb_adapter *adapter); | 97 | static boolean_t ixgb_clean_tx_irq(struct ixgb_adapter *adapter); |
98 | 98 | ||
99 | #ifdef CONFIG_IXGB_NAPI | 99 | #ifdef CONFIG_IXGB_NAPI |
@@ -1687,11 +1687,10 @@ ixgb_update_stats(struct ixgb_adapter *adapter) | |||
1687 | * ixgb_intr - Interrupt Handler | 1687 | * ixgb_intr - Interrupt Handler |
1688 | * @irq: interrupt number | 1688 | * @irq: interrupt number |
1689 | * @data: pointer to a network interface device structure | 1689 | * @data: pointer to a network interface device structure |
1690 | * @pt_regs: CPU registers structure | ||
1691 | **/ | 1690 | **/ |
1692 | 1691 | ||
1693 | static irqreturn_t | 1692 | static irqreturn_t |
1694 | ixgb_intr(int irq, void *data, struct pt_regs *regs) | 1693 | ixgb_intr(int irq, void *data) |
1695 | { | 1694 | { |
1696 | struct net_device *netdev = data; | 1695 | struct net_device *netdev = data; |
1697 | struct ixgb_adapter *adapter = netdev_priv(netdev); | 1696 | struct ixgb_adapter *adapter = netdev_priv(netdev); |
@@ -2213,7 +2212,7 @@ static void ixgb_netpoll(struct net_device *dev) | |||
2213 | struct ixgb_adapter *adapter = netdev_priv(dev); | 2212 | struct ixgb_adapter *adapter = netdev_priv(dev); |
2214 | 2213 | ||
2215 | disable_irq(adapter->pdev->irq); | 2214 | disable_irq(adapter->pdev->irq); |
2216 | ixgb_intr(adapter->pdev->irq, dev, NULL); | 2215 | ixgb_intr(adapter->pdev->irq, dev); |
2217 | enable_irq(adapter->pdev->irq); | 2216 | enable_irq(adapter->pdev->irq); |
2218 | } | 2217 | } |
2219 | #endif | 2218 | #endif |