diff options
Diffstat (limited to 'drivers/net/e1000')
-rw-r--r-- | drivers/net/e1000/e1000_ethtool.c | 3 | ||||
-rw-r--r-- | drivers/net/e1000/e1000_main.c | 7 |
2 files changed, 4 insertions, 6 deletions
diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c index 778ede3c0216..773821e4cf57 100644 --- a/drivers/net/e1000/e1000_ethtool.c +++ b/drivers/net/e1000/e1000_ethtool.c | |||
@@ -883,8 +883,7 @@ e1000_eeprom_test(struct e1000_adapter *adapter, uint64_t *data) | |||
883 | 883 | ||
884 | static irqreturn_t | 884 | static irqreturn_t |
885 | e1000_test_intr(int irq, | 885 | e1000_test_intr(int irq, |
886 | void *data, | 886 | void *data) |
887 | struct pt_regs *regs) | ||
888 | { | 887 | { |
889 | struct net_device *netdev = (struct net_device *) data; | 888 | struct net_device *netdev = (struct net_device *) data; |
890 | struct e1000_adapter *adapter = netdev_priv(netdev); | 889 | struct e1000_adapter *adapter = netdev_priv(netdev); |
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index 7dca38fba6a1..ce0d35fe3947 100644 --- a/drivers/net/e1000/e1000_main.c +++ b/drivers/net/e1000/e1000_main.c | |||
@@ -153,7 +153,7 @@ static int e1000_xmit_frame(struct sk_buff *skb, struct net_device *netdev); | |||
153 | static struct net_device_stats * e1000_get_stats(struct net_device *netdev); | 153 | static struct net_device_stats * e1000_get_stats(struct net_device *netdev); |
154 | static int e1000_change_mtu(struct net_device *netdev, int new_mtu); | 154 | static int e1000_change_mtu(struct net_device *netdev, int new_mtu); |
155 | static int e1000_set_mac(struct net_device *netdev, void *p); | 155 | static int e1000_set_mac(struct net_device *netdev, void *p); |
156 | static irqreturn_t e1000_intr(int irq, void *data, struct pt_regs *regs); | 156 | static irqreturn_t e1000_intr(int irq, void *data); |
157 | static boolean_t e1000_clean_tx_irq(struct e1000_adapter *adapter, | 157 | static boolean_t e1000_clean_tx_irq(struct e1000_adapter *adapter, |
158 | struct e1000_tx_ring *tx_ring); | 158 | struct e1000_tx_ring *tx_ring); |
159 | #ifdef CONFIG_E1000_NAPI | 159 | #ifdef CONFIG_E1000_NAPI |
@@ -3436,11 +3436,10 @@ e1000_update_stats(struct e1000_adapter *adapter) | |||
3436 | * e1000_intr - Interrupt Handler | 3436 | * e1000_intr - Interrupt Handler |
3437 | * @irq: interrupt number | 3437 | * @irq: interrupt number |
3438 | * @data: pointer to a network interface device structure | 3438 | * @data: pointer to a network interface device structure |
3439 | * @pt_regs: CPU registers structure | ||
3440 | **/ | 3439 | **/ |
3441 | 3440 | ||
3442 | static irqreturn_t | 3441 | static irqreturn_t |
3443 | e1000_intr(int irq, void *data, struct pt_regs *regs) | 3442 | e1000_intr(int irq, void *data) |
3444 | { | 3443 | { |
3445 | struct net_device *netdev = data; | 3444 | struct net_device *netdev = data; |
3446 | struct e1000_adapter *adapter = netdev_priv(netdev); | 3445 | struct e1000_adapter *adapter = netdev_priv(netdev); |
@@ -4862,7 +4861,7 @@ e1000_netpoll(struct net_device *netdev) | |||
4862 | struct e1000_adapter *adapter = netdev_priv(netdev); | 4861 | struct e1000_adapter *adapter = netdev_priv(netdev); |
4863 | 4862 | ||
4864 | disable_irq(adapter->pdev->irq); | 4863 | disable_irq(adapter->pdev->irq); |
4865 | e1000_intr(adapter->pdev->irq, netdev, NULL); | 4864 | e1000_intr(adapter->pdev->irq, netdev); |
4866 | e1000_clean_tx_irq(adapter, adapter->tx_ring); | 4865 | e1000_clean_tx_irq(adapter, adapter->tx_ring); |
4867 | #ifndef CONFIG_E1000_NAPI | 4866 | #ifndef CONFIG_E1000_NAPI |
4868 | adapter->clean_rx(adapter, adapter->rx_ring); | 4867 | adapter->clean_rx(adapter, adapter->rx_ring); |