- Update to 3.4-rc6.

[linux-flexiantxendom0-3.2.10.git] / drivers / net / ethernet / chelsio / cxgb3 / cxgb3_main.c

diff --git a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
index abb6ce7..b77398f 100644 (file)
--- a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
@@ -3313,7 +3313,17 @@ static int __devinit init_one(struct pci_dev *pdev,
         * register at least one net device.
         */
        for_each_port(adapter, i) {
+#ifndef CONFIG_XEN
                err = register_netdev(adapter->port[i]);
+#else
+               rtnl_lock();
+               err = register_netdevice(adapter->port[i]);
+               if (!err) {
+                       adapter->port[i]->wanted_features &= ~NETIF_F_GRO;
+                       netdev_update_features(adapter->port[i]);
+               }
+               rtnl_unlock();
+#endif
                if (err)
                        dev_warn(&pdev->dev,
                                 "cannot register net device %s, skipping\n",