Merge master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6

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

diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c
index aea1598b2253194b941bd1b96c521bd7698c0145..e5246f227c98afef92c476a1bbe55cdef3885d1c 100644 (file)
--- a/drivers/net/ibmveth.c
+++ b/drivers/net/ibmveth.c
@@ -237,7 +237,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->free_map[free_index] = index;
                        pool->skbuff[index] = NULL;
                        pool->consumer_index--;
                        dma_unmap_single(&adapter->vdev->dev,
@@ -276,10 +276,8 @@ static void ibmveth_free_buffer_pool(struct ibmveth_adapter *adapter, struct ibm
 {
        int i;
 
-       if(pool->free_map) {
-               kfree(pool->free_map);
-               pool->free_map  = NULL;
-       }
+       kfree(pool->free_map);
+       pool->free_map = NULL;
 
        if(pool->skbuff && pool->dma_addr) {
                for(i = 0; i < pool->size; ++i) {
@@ -516,7 +514,7 @@ static int ibmveth_open(struct net_device *netdev)
 
        if(lpar_rc != H_Success) {
                ibmveth_error_printk("h_register_logical_lan failed with %ld\n", lpar_rc);
-               ibmveth_error_printk("buffer TCE:0x%x filter TCE:0x%x rxq desc:0x%lx MAC:0x%lx\n",
+               ibmveth_error_printk("buffer TCE:0x%lx filter TCE:0x%lx rxq desc:0x%lx MAC:0x%lx\n",
                                     adapter->buffer_list_dma,
                                     adapter->filter_list_dma,
                                     rxq_desc.desc,
@@ -621,12 +619,18 @@ static int ibmveth_start_xmit(struct sk_buff *skb, struct net_device *netdev)
        unsigned long lpar_rc;
        int nfrags = 0, curfrag;
        unsigned long correlator;
+       unsigned long flags;
        unsigned int retry_count;
+       unsigned int tx_dropped = 0;
+       unsigned int tx_bytes = 0;
+       unsigned int tx_packets = 0;
+       unsigned int tx_send_failed = 0;
+       unsigned int tx_map_failed = 0;
+
 
        if ((skb_shinfo(skb)->nr_frags + 1) > IbmVethMaxSendFrags) {
-               adapter->stats.tx_dropped++;
-               dev_kfree_skb(skb);
-               return 0;
+               tx_dropped++;
+               goto out;
        }
 
        memset(&desc, 0, sizeof(desc));
@@ -645,10 +649,9 @@ static int ibmveth_start_xmit(struct sk_buff *skb, struct net_device *netdev)
 
        if(dma_mapping_error(desc[0].fields.address)) {
                ibmveth_error_printk("tx: unable to map initial fragment\n");
-               adapter->tx_map_failed++;
-               adapter->stats.tx_dropped++;
-               dev_kfree_skb(skb);
-               return 0;
+               tx_map_failed++;
+               tx_dropped++;
+               goto out;
        }
 
        curfrag = nfrags;
@@ -665,8 +668,8 @@ static int ibmveth_start_xmit(struct sk_buff *skb, struct net_device *netdev)
 
                if(dma_mapping_error(desc[curfrag+1].fields.address)) {
                        ibmveth_error_printk("tx: unable to map fragment %d\n", curfrag);
-                       adapter->tx_map_failed++;
-                       adapter->stats.tx_dropped++;
+                       tx_map_failed++;
+                       tx_dropped++;
                        /* Free all the mappings we just created */
                        while(curfrag < nfrags) {
                                dma_unmap_single(&adapter->vdev->dev,
@@ -675,8 +678,7 @@ static int ibmveth_start_xmit(struct sk_buff *skb, struct net_device *netdev)
                                                 DMA_TO_DEVICE);
                                curfrag++;
                        }
-                       dev_kfree_skb(skb);
-                       return 0;
+                       goto out;
                }
        }
 
@@ -701,11 +703,11 @@ static int ibmveth_start_xmit(struct sk_buff *skb, struct net_device *netdev)
                        ibmveth_error_printk("tx: desc[%i] valid=%d, len=%d, address=0x%d\n", i,
                                             desc[i].fields.valid, desc[i].fields.length, desc[i].fields.address);
                }
-               adapter->tx_send_failed++;
-               adapter->stats.tx_dropped++;
+               tx_send_failed++;
+               tx_dropped++;
        } else {
-               adapter->stats.tx_packets++;
-               adapter->stats.tx_bytes += skb->len;
+               tx_packets++;
+               tx_bytes += skb->len;
                netdev->trans_start = jiffies;
        }
 
@@ -715,6 +717,14 @@ static int ibmveth_start_xmit(struct sk_buff *skb, struct net_device *netdev)
                                desc[nfrags].fields.length, DMA_TO_DEVICE);
        } while(--nfrags >= 0);
 
+out:   spin_lock_irqsave(&adapter->stats_lock, flags);
+       adapter->stats.tx_dropped += tx_dropped;
+       adapter->stats.tx_bytes += tx_bytes;
+       adapter->stats.tx_packets += tx_packets;
+       adapter->tx_send_failed += tx_send_failed;
+       adapter->tx_map_failed += tx_map_failed;
+       spin_unlock_irqrestore(&adapter->stats_lock, flags);
+
        dev_kfree_skb(skb);
        return 0;
 }
@@ -980,6 +990,8 @@ static int __devinit ibmveth_probe(struct vio_dev *dev, const struct vio_device_
        netdev->ethtool_ops           = &netdev_ethtool_ops;
        netdev->change_mtu         = ibmveth_change_mtu;
        SET_NETDEV_DEV(netdev, &dev->dev);
+       netdev->features |= NETIF_F_LLTX; 
+       spin_lock_init(&adapter->stats_lock);
 
        memcpy(&netdev->dev_addr, &adapter->mac_addr, netdev->addr_len);
 
@@ -1162,14 +1174,16 @@ static struct vio_device_id ibmveth_device_table[] __devinitdata= {
        { "network", "IBM,l-lan"},
        { "", "" }
 };
-
 MODULE_DEVICE_TABLE(vio, ibmveth_device_table);
 
 static struct vio_driver ibmveth_driver = {
-       .name        = (char *)ibmveth_driver_name,
-       .id_table    = ibmveth_device_table,
-       .probe       = ibmveth_probe,
-       .remove      = ibmveth_remove
+       .id_table       = ibmveth_device_table,
+       .probe          = ibmveth_probe,
+       .remove         = ibmveth_remove,
+       .driver         = {
+               .name   = ibmveth_driver_name,
+               .owner  = THIS_MODULE,
+       }
 };
 
 static int __init ibmveth_module_init(void)