diff options
| -rw-r--r-- | drivers/net/ixgb/ixgb_main.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c index db1089c67ebc..35f6a7c271a2 100644 --- a/drivers/net/ixgb/ixgb_main.c +++ b/drivers/net/ixgb/ixgb_main.c | |||
| @@ -47,7 +47,7 @@ char ixgb_driver_string[] = "Intel(R) PRO/10GbE Network Driver"; | |||
| 47 | #else | 47 | #else |
| 48 | #define DRIVERNAPI "-NAPI" | 48 | #define DRIVERNAPI "-NAPI" |
| 49 | #endif | 49 | #endif |
| 50 | char ixgb_driver_version[] = "1.0.90-k2"DRIVERNAPI; | 50 | char ixgb_driver_version[] = "1.0.95-k2"DRIVERNAPI; |
| 51 | char ixgb_copyright[] = "Copyright (c) 1999-2005 Intel Corporation."; | 51 | char ixgb_copyright[] = "Copyright (c) 1999-2005 Intel Corporation."; |
| 52 | 52 | ||
| 53 | /* ixgb_pci_tbl - PCI Device ID Table | 53 | /* ixgb_pci_tbl - PCI Device ID Table |
| @@ -103,6 +103,7 @@ static int ixgb_change_mtu(struct net_device *netdev, int new_mtu); | |||
| 103 | static int ixgb_set_mac(struct net_device *netdev, void *p); | 103 | static int ixgb_set_mac(struct net_device *netdev, void *p); |
| 104 | static irqreturn_t ixgb_intr(int irq, void *data, struct pt_regs *regs); | 104 | static irqreturn_t ixgb_intr(int irq, void *data, struct pt_regs *regs); |
| 105 | static boolean_t ixgb_clean_tx_irq(struct ixgb_adapter *adapter); | 105 | static boolean_t ixgb_clean_tx_irq(struct ixgb_adapter *adapter); |
| 106 | |||
| 106 | #ifdef CONFIG_IXGB_NAPI | 107 | #ifdef CONFIG_IXGB_NAPI |
| 107 | static int ixgb_clean(struct net_device *netdev, int *budget); | 108 | static int ixgb_clean(struct net_device *netdev, int *budget); |
| 108 | static boolean_t ixgb_clean_rx_irq(struct ixgb_adapter *adapter, | 109 | static boolean_t ixgb_clean_rx_irq(struct ixgb_adapter *adapter, |
| @@ -1253,6 +1254,7 @@ ixgb_tx_map(struct ixgb_adapter *adapter, struct sk_buff *skb, | |||
| 1253 | 1254 | ||
| 1254 | unsigned int nr_frags = skb_shinfo(skb)->nr_frags; | 1255 | unsigned int nr_frags = skb_shinfo(skb)->nr_frags; |
| 1255 | unsigned int f; | 1256 | unsigned int f; |
| 1257 | |||
| 1256 | len -= skb->data_len; | 1258 | len -= skb->data_len; |
| 1257 | 1259 | ||
| 1258 | i = tx_ring->next_to_use; | 1260 | i = tx_ring->next_to_use; |
| @@ -1857,7 +1859,6 @@ ixgb_clean_rx_irq(struct ixgb_adapter *adapter) | |||
| 1857 | next_skb = next_buffer->skb; | 1859 | next_skb = next_buffer->skb; |
| 1858 | prefetch(next_skb); | 1860 | prefetch(next_skb); |
| 1859 | 1861 | ||
| 1860 | |||
| 1861 | cleaned = TRUE; | 1862 | cleaned = TRUE; |
| 1862 | 1863 | ||
| 1863 | pci_unmap_single(pdev, | 1864 | pci_unmap_single(pdev, |
| @@ -2108,6 +2109,7 @@ ixgb_restore_vlan(struct ixgb_adapter *adapter) | |||
| 2108 | static void ixgb_netpoll(struct net_device *dev) | 2109 | static void ixgb_netpoll(struct net_device *dev) |
| 2109 | { | 2110 | { |
| 2110 | struct ixgb_adapter *adapter = dev->priv; | 2111 | struct ixgb_adapter *adapter = dev->priv; |
| 2112 | |||
| 2111 | disable_irq(adapter->pdev->irq); | 2113 | disable_irq(adapter->pdev->irq); |
| 2112 | ixgb_intr(adapter->pdev->irq, dev, NULL); | 2114 | ixgb_intr(adapter->pdev->irq, dev, NULL); |
| 2113 | enable_irq(adapter->pdev->irq); | 2115 | enable_irq(adapter->pdev->irq); |
