Merge branch 'topic/vmaster-update' into topic/docbook-fix

[linux-2.6-omap-h63xx.git] / drivers / net / cxgb3 / cxgb3_main.c

diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c
index 2847f947499d9f9edcdaaf672c9f876d3602d571..bab8a934c33d949127286fdc0ef07714bb7bb4b7 100644 (file)
--- a/drivers/net/cxgb3/cxgb3_main.c
+++ b/drivers/net/cxgb3/cxgb3_main.c
@@ -90,6 +90,7 @@ static const struct pci_device_id cxgb3_pci_tbl[] = {
        CH_DEVICE(0x30, 2),     /* T3B10 */
        CH_DEVICE(0x31, 3),     /* T3B20 */
        CH_DEVICE(0x32, 1),     /* T3B02 */
+       CH_DEVICE(0x35, 6),     /* T3C20-derived T3C10 */
        {0,}
 };
 
@@ -546,7 +547,7 @@ static int setup_sge_qsets(struct adapter *adap)
                pi->qs = &adap->sge.qs[pi->first_qset];
                for (j = pi->first_qset; j < pi->first_qset + pi->nqsets;
                     ++j, ++qset_idx) {
-                       set_qset_lro(dev, qset_idx, pi->rx_csum_offload);
+                       set_qset_lro(dev, qset_idx, pi->rx_offload & T3_LRO);
                        err = t3_sge_alloc_qset(adap, qset_idx, 1,
                                (adap->flags & USING_MSIX) ? qset_idx + 1 :
                                                             irq_idx,
@@ -1657,17 +1658,19 @@ static u32 get_rx_csum(struct net_device *dev)
 {
        struct port_info *p = netdev_priv(dev);
 
-       return p->rx_csum_offload;
+       return p->rx_offload & T3_RX_CSUM;
 }
 
 static int set_rx_csum(struct net_device *dev, u32 data)
 {
        struct port_info *p = netdev_priv(dev);
 
-       p->rx_csum_offload = data;
-       if (!data) {
+       if (data) {
+               p->rx_offload |= T3_RX_CSUM;
+       } else {
                int i;
 
+               p->rx_offload &= ~(T3_RX_CSUM | T3_LRO);
                for (i = p->first_qset; i < p->first_qset + p->nqsets; i++)
                        set_qset_lro(dev, i, 0);
        }
@@ -1830,15 +1833,18 @@ static int cxgb3_set_flags(struct net_device *dev, u32 data)
        int i;
 
        if (data & ETH_FLAG_LRO) {
-               if (!pi->rx_csum_offload)
+               if (!(pi->rx_offload & T3_RX_CSUM))
                        return -EINVAL;
 
+               pi->rx_offload |= T3_LRO;
                for (i = pi->first_qset; i < pi->first_qset + pi->nqsets; i++)
                        set_qset_lro(dev, i, 1);
 
-       } else
+       } else {
+               pi->rx_offload &= ~T3_LRO;
                for (i = pi->first_qset; i < pi->first_qset + pi->nqsets; i++)
                        set_qset_lro(dev, i, 0);
+       }
 
        return 0;
 }
@@ -1926,7 +1932,7 @@ static int cxgb_extension_ioctl(struct net_device *dev, void __user *useraddr)
                                pi = adap2pinfo(adapter, i);
                                if (t.qset_idx >= pi->first_qset &&
                                    t.qset_idx < pi->first_qset + pi->nqsets &&
-                                   !pi->rx_csum_offload)
+                                   !(pi->rx_offload & T3_RX_CSUM))
                                        return -EINVAL;
                        }
 
@@ -2946,7 +2952,7 @@ static int __devinit init_one(struct pci_dev *pdev,
                adapter->port[i] = netdev;
                pi = netdev_priv(netdev);
                pi->adapter = adapter;
-               pi->rx_csum_offload = 1;
+               pi->rx_offload = T3_RX_CSUM | T3_LRO;
                pi->port_id = i;
                netif_carrier_off(netdev);
                netif_tx_stop_all_queues(netdev);
@@ -2955,6 +2961,7 @@ static int __devinit init_one(struct pci_dev *pdev,
                netdev->mem_end = mmio_start + mmio_len - 1;
                netdev->features |= NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO;
                netdev->features |= NETIF_F_LLTX;
+               netdev->features |= NETIF_F_LRO;
                if (pci_using_dac)
                        netdev->features |= NETIF_F_HIGHDMA;