Merge branch 'upstream' of git://lost.foo-projects.org/~ahkok/git/netdev-2.6 into upstream

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/net/e100.c b/drivers/net/e100.c
index b42ad76b1116..3b0b95892d5f 100644
--- a/drivers/net/e100.c
+++ b/drivers/net/e100.c
@@ -159,7 +159,7 @@
 
 #define DRV_NAME                "e100"
 #define DRV_EXT                 "-NAPI"
-#define DRV_VERSION             "3.5.10-k4"DRV_EXT
+#define DRV_VERSION             "3.5.16-k2"DRV_EXT
 #define DRV_DESCRIPTION         "Intel(R) PRO/100 Network Driver"
 #define DRV_COPYRIGHT           "Copyright(c) 1999-2006 Intel Corporation"
 #define PFX                     DRV_NAME ": "
@@ -1759,11 +1759,10 @@ static inline void e100_start_receiver(struct nic *nic, struct rx *rx)
 #define RFD_BUF_LEN (sizeof(struct rfd) + VLAN_ETH_FRAME_LEN)
 static int e100_rx_alloc_skb(struct nic *nic, struct rx *rx)
 {
-        if(!(rx->skb = dev_alloc_skb(RFD_BUF_LEN + NET_IP_ALIGN)))
+        if(!(rx->skb = netdev_alloc_skb(nic->netdev, RFD_BUF_LEN + NET_IP_ALIGN)))
                 return -ENOMEM;
 
         /* Align, init, and map the RFD. */
-        rx->skb->dev = nic->netdev;
         skb_reserve(rx->skb, NET_IP_ALIGN);
         memcpy(rx->skb->data, &nic->blank_rfd, sizeof(struct rfd));
         rx->dma_addr = pci_map_single(nic->pdev, rx->skb->data,
@@ -2139,7 +2138,7 @@ static int e100_loopback_test(struct nic *nic, enum loopback loopback_mode)
 
         e100_start_receiver(nic, NULL);
 
-        if(!(skb = dev_alloc_skb(ETH_DATA_LEN))) {
+        if(!(skb = netdev_alloc_skb(nic->netdev, ETH_DATA_LEN))) {
                 err = -ENOMEM;
                 goto err_loopback_none;
         }
@@ -2791,6 +2790,7 @@ static pci_ers_result_t e100_io_error_detected(struct pci_dev *pdev, pci_channel
         /* Detach; put netif into state similar to hotplug unplug. */
         netif_poll_enable(netdev);
         netif_device_detach(netdev);
+        pci_disable_device(pdev);
 
         /* Request a slot reset. */
         return PCI_ERS_RESULT_NEED_RESET;