vserver 1.9.3

[linux-2.6.git] / drivers / net / ibmveth.c

diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c
index 5fa162f..be0729d 100644 (file)
--- a/drivers/net/ibmveth.c
+++ b/drivers/net/ibmveth.c
@@ -2,8 +2,8 @@
 /*                                                                        */
 /* IBM eServer i/pSeries Virtual Ethernet Device Driver                   */
 /* Copyright (C) 2003 IBM Corp.                                           */
-/*  Dave Larson (larson1@us.ibm.com)                                      */
-/*  Santiago Leon (santil@us.ibm.com)                                     */
+/*  Originally written by Dave Larson (larson1@us.ibm.com)                */
+/*  Maintained by Santiago Leon (santil@us.ibm.com)                       */
 /*                                                                        */
 /*  This program is free software; you can redistribute it and/or modify  */
 /*  it under the terms of the GNU General Public License as published by  */
@@ -104,11 +104,12 @@ static struct proc_dir_entry *ibmveth_proc_dir;
 
 static const char ibmveth_driver_name[] = "ibmveth";
 static const char ibmveth_driver_string[] = "IBM i/pSeries Virtual Ethernet Driver";
-static const char ibmveth_driver_version[] = "1.0";
+#define ibmveth_driver_version "1.02"
 
-MODULE_AUTHOR("Dave Larson <larson1@us.ibm.com>");
+MODULE_AUTHOR("Santiago Leon <santil@us.ibm.com>");
 MODULE_DESCRIPTION("IBM i/pSeries Virtual Ethernet Driver");
 MODULE_LICENSE("GPL");
+MODULE_VERSION(ibmveth_driver_version);
 
 /* simple methods of getting data from the current rxq entry */
 static inline int ibmveth_rxq_pending_buffer(struct ibmveth_adapter *adapter)
@@ -213,11 +214,12 @@ static void ibmveth_replenish_buffer_pool(struct ibmveth_adapter *adapter, struc
                free_index = pool->consumer_index++ % pool->size;
                index = pool->free_map[free_index];
        
-               ibmveth_assert(index != 0xffff);
+               ibmveth_assert(index != IBM_VETH_INVALID_MAP);
                ibmveth_assert(pool->skbuff[index] == NULL);
 
                dma_addr = vio_map_single(adapter->vdev, skb->data, pool->buff_size, DMA_FROM_DEVICE);
 
+               pool->free_map[free_index] = IBM_VETH_INVALID_MAP;
                pool->dma_addr[index] = dma_addr;
                pool->skbuff[index] = skb;
 
@@ -232,6 +234,7 @@ static void ibmveth_replenish_buffer_pool(struct ibmveth_adapter *adapter, struc
                lpar_rc = h_add_logical_lan_buffer(adapter->vdev->unit_address, desc.desc);
                    
                if(lpar_rc != H_Success) {
+                       pool->free_map[free_index] = IBM_VETH_INVALID_MAP;
                        pool->skbuff[index] = NULL;
                        pool->consumer_index--;
                        vio_unmap_single(adapter->vdev, pool->dma_addr[index], pool->buff_size, DMA_FROM_DEVICE);
@@ -239,7 +242,6 @@ static void ibmveth_replenish_buffer_pool(struct ibmveth_adapter *adapter, struc
                        adapter->replenish_add_buff_failure++;
                        break;
                } else {
-                       pool->free_map[free_index] = 0xffff;
                        buffers_added++;
                        adapter->replenish_add_buff_success++;
                }
@@ -269,7 +271,6 @@ static void ibmveth_replenish_task(struct ibmveth_adapter *adapter)
        adapter->rx_no_buffer = *(u64*)(((char*)adapter->buffer_list_addr) + 4096 - 8);
 
        atomic_inc(&adapter->not_replenishing);
-       ibmveth_assert(atomic_read(&adapter->not_replenishing) == 1);
 }
 
 /* kick the replenish tasklet if we need replenishing and it isn't already running */
@@ -528,7 +529,7 @@ static int ibmveth_open(struct net_device *netdev)
                ibmveth_error_printk("unable to request irq 0x%x, rc %d\n", netdev->irq, rc);
                do {
                        rc = h_free_logical_lan(adapter->vdev->unit_address);
-               } while H_isLongBusy(rc);
+               } while (H_isLongBusy(rc) || (rc == H_Busy));
 
                ibmveth_cleanup(adapter);
                return rc;
@@ -560,7 +561,7 @@ static int ibmveth_close(struct net_device *netdev)
 
        do {
                lpar_rc = h_free_logical_lan(adapter->vdev->unit_address);
-       } while H_isLongBusy(lpar_rc);
+       } while (H_isLongBusy(lpar_rc) || (lpar_rc == H_Busy));
 
        if(lpar_rc != H_Success)
        {
@@ -732,6 +733,8 @@ static int ibmveth_poll(struct net_device *netdev, int *budget)
                if(ibmveth_rxq_pending_buffer(adapter)) {
                        struct sk_buff *skb;
 
+                       rmb();
+
                        if(!ibmveth_rxq_buffer_valid(adapter)) {
                                wmb(); /* suggested by larson1 */
                                adapter->rx_invalid_buffer++;
@@ -882,13 +885,16 @@ static int __devinit ibmveth_probe(struct vio_dev *dev, const struct vio_device_
 
        mac_addr_p = (unsigned char *) vio_get_attribute(dev, VETH_MAC_ADDR, 0);
        if(!mac_addr_p) {
-               ibmveth_error_printk("Can't find VETH_MAC_ADDR attribute\n");
+               printk(KERN_ERR "(%s:%3.3d) ERROR: Can't find VETH_MAC_ADDR "
+                               "attribute\n", __FILE__, __LINE__);
                return 0;
        }
        
        mcastFilterSize_p= (unsigned int *) vio_get_attribute(dev, VETH_MCAST_FILTER_SIZE, 0);
        if(!mcastFilterSize_p) {
-               ibmveth_error_printk("Can't find VETH_MCAST_FILTER_SIZE attribute\n");
+               printk(KERN_ERR "(%s:%3.3d) ERROR: Can't find "
+                               "VETH_MCAST_FILTER_SIZE attribute\n",
+                               __FILE__, __LINE__);
                return 0;
        }