Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (21 commits)
  r8169: revert "r8169: read MAC address from EEPROM on init (2nd attempt)"
  r8169: use hardware auto-padding.
  igb: remove ASPM L0s workaround
  netxen: remove old flash check.
  mv643xx_eth: fix unicast address filter corruption on mtu change
  xfrm: Fix xfrm_state_find() wrt. wildcard source address.
  emac: Fix clock control for 405EX and 405EXr chips
  ixgbe: fix multiple unicast address support
  via-velocity: Fix DMA mapping length errors on transmit.
  qlge: bugfix: Pad outbound frames smaller than 60 bytes.
  qlge: bugfix: Move netif_napi_del() to common call point.
  qlge: bugfix: Tell hw to strip vlan header.
  qlge: bugfix: Increase filter on inbound csum.
  dnet: replace obsolete *netif_rx_* functions with *napi_*
  net: Add be2net driver.
  dnet: Fix warnings on 64-bit.
  dnet: Dave DNET ethernet controller driver (updated)
  ipv6:  Fix BUG when disabled ipv6 module is unloaded
  bnx2x: Using DMAE to initialize the chip
  bnx2x: Casting page alignment
  ...

1 files changed, 38 insertions, 19 deletions

diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c
index 8ea72dc60f79..91191f761fba 100644
--- a/drivers/net/qlge/qlge_main.c
+++ b/drivers/net/qlge/qlge_main.c
@@ -1436,18 +1436,32 @@ static void ql_process_mac_rx_intr(struct ql_adapter *qdev,
         if (ib_mac_rsp->flags2 & IB_MAC_IOCB_RSP_P) {
                 QPRINTK(qdev, RX_STATUS, DEBUG, "Promiscuous Packet.\n");
         }
-        if (ib_mac_rsp->flags1 & (IB_MAC_IOCB_RSP_IE | IB_MAC_IOCB_RSP_TE)) {
-                QPRINTK(qdev, RX_STATUS, ERR,
-                        "Bad checksum for this %s packet.\n",
-                        ((ib_mac_rsp->
-                          flags2 & IB_MAC_IOCB_RSP_T) ? "TCP" : "UDP"));
-                skb->ip_summed = CHECKSUM_NONE;
-        } else if (qdev->rx_csum &&
-                   ((ib_mac_rsp->flags2 & IB_MAC_IOCB_RSP_T) ||
-                    ((ib_mac_rsp->flags2 & IB_MAC_IOCB_RSP_U) &&
-                     !(ib_mac_rsp->flags1 & IB_MAC_IOCB_RSP_NU)))) {
-                QPRINTK(qdev, RX_STATUS, DEBUG, "RX checksum done!\n");
-                skb->ip_summed = CHECKSUM_UNNECESSARY;
+
+        skb->protocol = eth_type_trans(skb, ndev);
+        skb->ip_summed = CHECKSUM_NONE;
+
+        /* If rx checksum is on, and there are no
+         * csum or frame errors.
+         */
+        if (qdev->rx_csum &&
+                !(ib_mac_rsp->flags2 & IB_MAC_IOCB_RSP_ERR_MASK) &&
+                !(ib_mac_rsp->flags1 & IB_MAC_CSUM_ERR_MASK)) {
+                /* TCP frame. */
+                if (ib_mac_rsp->flags2 & IB_MAC_IOCB_RSP_T) {
+                        QPRINTK(qdev, RX_STATUS, DEBUG,
+                                        "TCP checksum done!\n");
+                        skb->ip_summed = CHECKSUM_UNNECESSARY;
+                } else if ((ib_mac_rsp->flags2 & IB_MAC_IOCB_RSP_U) &&
+                                (ib_mac_rsp->flags3 & IB_MAC_IOCB_RSP_V4)) {
+                /* Unfragmented ipv4 UDP frame. */
+                        struct iphdr *iph = (struct iphdr *) skb->data;
+                        if (!(iph->frag_off &
+                                cpu_to_be16(IP_MF|IP_OFFSET))) {
+                                skb->ip_summed = CHECKSUM_UNNECESSARY;
+                                QPRINTK(qdev, RX_STATUS, DEBUG,
+                                                "TCP checksum done!\n");
+                        }
+                }
         }
         qdev->stats.rx_packets++;
         qdev->stats.rx_bytes += skb->len;
@@ -1927,6 +1941,9 @@ static int qlge_send(struct sk_buff *skb, struct net_device *ndev)
 
         tx_ring = &qdev->tx_ring[tx_ring_idx];
 
+        if (skb_padto(skb, ETH_ZLEN))
+                return NETDEV_TX_OK;
+
         if (unlikely(atomic_read(&tx_ring->tx_count) < 2)) {
                 QPRINTK(qdev, TX_QUEUED, INFO,
                         "%s: shutting down tx queue %d du to lack of resources.\n",
@@ -2970,9 +2987,9 @@ static int ql_adapter_initialize(struct ql_adapter *qdev)
         mask = value << 16;
         ql_write32(qdev, SYS, mask | value);
 
-        /* Set the default queue. */
-        value = NIC_RCV_CFG_DFQ;
-        mask = NIC_RCV_CFG_DFQ_MASK;
+        /* Set the default queue, and VLAN behavior. */
+        value = NIC_RCV_CFG_DFQ | NIC_RCV_CFG_RV;
+        mask = NIC_RCV_CFG_DFQ_MASK | (NIC_RCV_CFG_RV << 16);
         ql_write32(qdev, NIC_RCV_CFG, (mask | value));
 
         /* Set the MPI interrupt to enabled. */
@@ -3149,6 +3166,11 @@ static int ql_adapter_down(struct ql_adapter *qdev)
 
         ql_tx_ring_clean(qdev);
 
+        /* Call netif_napi_del() from common point.
+         */
+        for (i = qdev->rss_ring_first_cq_id; i < qdev->rx_ring_count; i++)
+                netif_napi_del(&qdev->rx_ring[i].napi);
+
         spin_lock(&qdev->hw_lock);
         status = ql_adapter_reset(qdev);
         if (status)
@@ -3853,7 +3875,7 @@ static int qlge_suspend(struct pci_dev *pdev, pm_message_t state)
 {
         struct net_device *ndev = pci_get_drvdata(pdev);
         struct ql_adapter *qdev = netdev_priv(ndev);
-        int err, i;
+        int err;
 
         netif_device_detach(ndev);
 
@@ -3863,9 +3885,6 @@ static int qlge_suspend(struct pci_dev *pdev, pm_message_t state)
                         return err;
         }
 
-        for (i = qdev->rss_ring_first_cq_id; i < qdev->rx_ring_count; i++)
-                netif_napi_del(&qdev->rx_ring[i].napi);
-
         err = pci_save_state(pdev);
         if (err)
                 return err;