← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to drivers/infiniband/ulp/ipoib/ipoib_cm.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/infiniband/ulp/ipoib/ipoib_cm.c
1463
1463
                set_bit(IPOIB_FLAG_ADMIN_CM, &priv->flags);
1464
1464
                ipoib_warn(priv, "enabling connected mode "
1465
1465
                           "will cause multicast packet drops\n");
1466
 
 
1467
 
                dev->features &= ~(NETIF_F_IP_CSUM | NETIF_F_SG | NETIF_F_TSO);
 
1466
                netdev_update_features(dev);
1468
1467
                rtnl_unlock();
1469
1468
                priv->tx_wr.send_flags &= ~IB_SEND_IP_CSUM;
1470
1469
 
1474
1473
 
1475
1474
        if (!strcmp(buf, "datagram\n")) {
1476
1475
                clear_bit(IPOIB_FLAG_ADMIN_CM, &priv->flags);
1477
 
 
1478
 
                if (test_bit(IPOIB_FLAG_CSUM, &priv->flags)) {
1479
 
                        dev->features |= NETIF_F_IP_CSUM | NETIF_F_SG;
1480
 
                        priv->dev->features |= NETIF_F_GRO;
1481
 
                        if (priv->hca_caps & IB_DEVICE_UD_TSO)
1482
 
                                dev->features |= NETIF_F_TSO;
1483
 
                }
 
1476
                netdev_update_features(dev);
1484
1477
                dev_set_mtu(dev, min(priv->mcast_mtu, dev->mtu));
1485
1478
                rtnl_unlock();
1486
1479
                ipoib_flush_paths(dev);