Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke...

[karo-tx-linux.git] / drivers / net / vmxnet3 / vmxnet3_drv.c

diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c
index 3b55fbd1294d8526cde05c19ecc0d1dc0c33b9a3..abe0ff53daf353c1be44876b19cf37f4cefe4403 100644 (file)
--- a/drivers/net/vmxnet3/vmxnet3_drv.c
+++ b/drivers/net/vmxnet3/vmxnet3_drv.c
@@ -664,8 +664,13 @@ vmxnet3_map_pkt(struct sk_buff *skb, struct vmxnet3_tx_ctx *ctx,
        while (len) {
                u32 buf_size;
 
-               buf_size = len > VMXNET3_MAX_TX_BUF_SIZE ?
-                          VMXNET3_MAX_TX_BUF_SIZE : len;
+               if (len < VMXNET3_MAX_TX_BUF_SIZE) {
+                       buf_size = len;
+                       dw2 |= len;
+               } else {
+                       buf_size = VMXNET3_MAX_TX_BUF_SIZE;
+                       /* spec says that for TxDesc.len, 0 == 2^14 */
+               }
 
                tbi = tq->buf_info + tq->tx_ring.next2fill;
                tbi->map_type = VMXNET3_MAP_SINGLE;
@@ -673,13 +678,13 @@ vmxnet3_map_pkt(struct sk_buff *skb, struct vmxnet3_tx_ctx *ctx,
                                skb->data + buf_offset, buf_size,
                                PCI_DMA_TODEVICE);
 
-               tbi->len = buf_size; /* this automatically convert 2^14 to 0 */
+               tbi->len = buf_size;
 
                gdesc = tq->tx_ring.base + tq->tx_ring.next2fill;
                BUG_ON(gdesc->txd.gen == tq->tx_ring.gen);
 
                gdesc->txd.addr = cpu_to_le64(tbi->dma_addr);
-               gdesc->dword[2] = cpu_to_le32(dw2 | buf_size);
+               gdesc->dword[2] = cpu_to_le32(dw2);
                gdesc->dword[3] = 0;
 
                dev_dbg(&adapter->netdev->dev,
@@ -2302,9 +2307,13 @@ vmxnet3_alloc_intr_resources(struct vmxnet3_adapter *adapter)
        adapter->intr.mask_mode = (cfg >> 2) & 0x3;
 
        if (adapter->intr.type == VMXNET3_IT_AUTO) {
-               int err;
+               adapter->intr.type = VMXNET3_IT_MSIX;
+       }
 
 #ifdef CONFIG_PCI_MSI
+       if (adapter->intr.type == VMXNET3_IT_MSIX) {
+               int err;
+
                adapter->intr.msix_entries[0].entry = 0;
                err = pci_enable_msix(adapter->pdev, adapter->intr.msix_entries,
                                      VMXNET3_LINUX_MAX_MSIX_VECT);
@@ -2313,15 +2322,18 @@ vmxnet3_alloc_intr_resources(struct vmxnet3_adapter *adapter)
                        adapter->intr.type = VMXNET3_IT_MSIX;
                        return;
                }
-#endif
+               adapter->intr.type = VMXNET3_IT_MSI;
+       }
 
+       if (adapter->intr.type == VMXNET3_IT_MSI) {
+               int err;
                err = pci_enable_msi(adapter->pdev);
                if (!err) {
                        adapter->intr.num_intrs = 1;
-                       adapter->intr.type = VMXNET3_IT_MSI;
                        return;
                }
        }
+#endif /* CONFIG_PCI_MSI */
 
        adapter->intr.type = VMXNET3_IT_INTX;