1 files changed, 9 insertions, 15 deletions

diff --git a/drivers/net/netxen/netxen_nic_init.c b/drivers/net/netxen/netxen_nic_init.c
index b075a35b85d4..7f999671c7b2 100644
--- a/drivers/net/netxen/netxen_nic_init.c
+++ b/drivers/net/netxen/netxen_nic_init.c
@@ -214,13 +214,12 @@ int netxen_alloc_sw_resources(struct netxen_adapter *adapter)
         tx_ring->num_desc = adapter->num_txd;
         tx_ring->txq = netdev_get_tx_queue(netdev, 0);
 
-        cmd_buf_arr = vmalloc(TX_BUFF_RINGSIZE(tx_ring));
+        cmd_buf_arr = vzalloc(TX_BUFF_RINGSIZE(tx_ring));
         if (cmd_buf_arr == NULL) {
                 dev_err(&pdev->dev, "%s: failed to allocate cmd buffer ring\n",
                        netdev->name);
                 goto err_out;
         }
-        memset(cmd_buf_arr, 0, TX_BUFF_RINGSIZE(tx_ring));
         tx_ring->cmd_buf_arr = cmd_buf_arr;
 
         recv_ctx = &adapter->recv_ctx;
@@ -279,8 +278,7 @@ int netxen_alloc_sw_resources(struct netxen_adapter *adapter)
                         break;
 
                 }
-                rds_ring->rx_buf_arr = (struct netxen_rx_buffer *)
-                        vmalloc(RCV_BUFF_RINGSIZE(rds_ring));
+                rds_ring->rx_buf_arr = vzalloc(RCV_BUFF_RINGSIZE(rds_ring));
                 if (rds_ring->rx_buf_arr == NULL) {
                         printk(KERN_ERR "%s: Failed to allocate "
                                 "rx buffer ring %d\n",
@@ -288,7 +286,6 @@ int netxen_alloc_sw_resources(struct netxen_adapter *adapter)
                         /* free whatever was already allocated */
                         goto err_out;
                 }
-                memset(rds_ring->rx_buf_arr, 0, RCV_BUFF_RINGSIZE(rds_ring));
                 INIT_LIST_HEAD(&rds_ring->free_list);
                 /*
                  * Now go through all of them, set reference handles
@@ -346,7 +343,7 @@ static u32 netxen_decode_crb_addr(u32 addr)
         if (pci_base == NETXEN_ADDR_ERROR)
                 return pci_base;
         else
-                return (pci_base + offset);
+                return pci_base + offset;
 }
 
 #define NETXEN_MAX_ROM_WAIT_USEC        100
@@ -1486,7 +1483,8 @@ static struct sk_buff *netxen_process_rxbuf(struct netxen_adapter *adapter,
         if (!skb)
                 goto no_skb;
 
-        if (likely(adapter->rx_csum && cksum == STATUS_CKSUM_OK)) {
+        if (likely((adapter->netdev->features & NETIF_F_RXCSUM)
+            && cksum == STATUS_CKSUM_OK)) {
                 adapter->stats.csummed++;
                 skb->ip_summed = CHECKSUM_UNNECESSARY;
         } else
@@ -1763,14 +1761,10 @@ int netxen_process_cmd_ring(struct netxen_adapter *adapter)
 
                 smp_mb();
 
-                if (netif_queue_stopped(netdev) && netif_carrier_ok(netdev)) {
-                        __netif_tx_lock(tx_ring->txq, smp_processor_id());
-                        if (netxen_tx_avail(tx_ring) > TX_STOP_THRESH) {
+                if (netif_queue_stopped(netdev) && netif_carrier_ok(netdev))
+                        if (netxen_tx_avail(tx_ring) > TX_STOP_THRESH)
                                 netif_wake_queue(netdev);
-                                adapter->tx_timeo_cnt = 0;
-                        }
-                        __netif_tx_unlock(tx_ring->txq);
-                }
+                adapter->tx_timeo_cnt = 0;
         }
         /*
          * If everything is freed up to consumer then check if the ring is full
@@ -1789,7 +1783,7 @@ int netxen_process_cmd_ring(struct netxen_adapter *adapter)
         done = (sw_consumer == hw_consumer);
         spin_unlock(&adapter->tx_clean_lock);
 
-        return (done);
+        return done;
 }
 
 void