[XFS] Fix merge failures

[pandora-kernel.git] / drivers / net / cxgb3 / cxgb3_main.c

diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c
index e1746ee..2847f94 100644 (file)
--- a/drivers/net/cxgb3/cxgb3_main.c
+++ b/drivers/net/cxgb3/cxgb3_main.c
@@ -550,7 +550,8 @@ static int setup_sge_qsets(struct adapter *adap)
                        err = t3_sge_alloc_qset(adap, qset_idx, 1,
                                (adap->flags & USING_MSIX) ? qset_idx + 1 :
                                                             irq_idx,
-                               &adap->params.sge.qset[qset_idx], ntxq, dev);
+                               &adap->params.sge.qset[qset_idx], ntxq, dev,
+                               netdev_get_tx_queue(dev, j));
                        if (err) {
                                t3_stop_sge_timers(adap);
                                t3_free_sge_resources(adap);
@@ -853,8 +854,8 @@ static int bind_qsets(struct adapter *adap)
        return err;
 }
 
-#define FW_FNAME "t3fw-%d.%d.%d.bin"
-#define TPSRAM_NAME "t3%c_protocol_sram-%d.%d.%d.bin"
+#define FW_FNAME "cxgb3/t3fw-%d.%d.%d.bin"
+#define TPSRAM_NAME "cxgb3/t3%c_psram-%d.%d.%d.bin"
 
 static int upgrade_fw(struct adapter *adap)
 {
@@ -957,21 +958,22 @@ release_tpsram:
 static int cxgb_up(struct adapter *adap)
 {
        int err;
-       int must_load;
 
        if (!(adap->flags & FULL_INIT_DONE)) {
-               err = t3_check_fw_version(adap, &must_load);
+               err = t3_check_fw_version(adap);
                if (err == -EINVAL) {
                        err = upgrade_fw(adap);
-                       if (err && must_load)
-                               goto out;
+                       CH_WARN(adap, "FW upgrade to %d.%d.%d %s\n",
+                               FW_VERSION_MAJOR, FW_VERSION_MINOR,
+                               FW_VERSION_MICRO, err ? "failed" : "succeeded");
                }
 
-               err = t3_check_tpsram_version(adap, &must_load);
+               err = t3_check_tpsram_version(adap);
                if (err == -EINVAL) {
                        err = update_tpsram(adap);
-                       if (err && must_load)
-                               goto out;
+                       CH_WARN(adap, "TP upgrade to %d.%d.%d %s\n",
+                               TP_VERSION_MAJOR, TP_VERSION_MINOR,
+                               TP_VERSION_MICRO, err ? "failed" : "succeeded");
                }
 
                /*
@@ -1165,9 +1167,10 @@ static int cxgb_open(struct net_device *dev)
                               "Could not initialize offload capabilities\n");
        }
 
+       dev->real_num_tx_queues = pi->nqsets;
        link_start(dev);
        t3_port_intr_enable(adapter, pi->port_id);
-       netif_start_queue(dev);
+       netif_tx_start_all_queues(dev);
        if (!other_ports)
                schedule_chk_task(adapter);
 
@@ -1180,7 +1183,7 @@ static int cxgb_close(struct net_device *dev)
        struct adapter *adapter = pi->adapter;
 
        t3_port_intr_disable(adapter, pi->port_id);
-       netif_stop_queue(dev);
+       netif_tx_stop_all_queues(dev);
        pi->phy.ops->power_down(&pi->phy, 1);
        netif_carrier_off(dev);
        t3_mac_disable(&pi->mac, MAC_DIRECTION_TX | MAC_DIRECTION_RX);
@@ -1336,8 +1339,10 @@ static void get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
        u32 fw_vers = 0;
        u32 tp_vers = 0;
 
+       spin_lock(&adapter->stats_lock);
        t3_get_fw_version(adapter, &fw_vers);
        t3_get_tp_version(adapter, &tp_vers);
+       spin_unlock(&adapter->stats_lock);
 
        strcpy(info->driver, DRV_NAME);
        strcpy(info->version, DRV_VERSION);
@@ -2744,7 +2749,7 @@ static void set_nqsets(struct adapter *adap)
        int hwports = adap->params.nports;
        int nqsets = SGE_QSETS;
 
-       if (adap->params.rev > 0) {
+       if (adap->params.rev > 0 && adap->flags & USING_MSIX) {
                if (hwports == 2 &&
                    (hwports * nqsets > SGE_QSETS ||
                     num_cpus >= nqsets / hwports))
@@ -2826,6 +2831,22 @@ static void __devinit print_port_info(struct adapter *adap,
        }
 }
 
+static const struct net_device_ops cxgb_netdev_ops = {
+       .ndo_open               = cxgb_open,
+       .ndo_stop               = cxgb_close,
+       .ndo_start_xmit         = t3_eth_xmit,
+       .ndo_get_stats          = cxgb_get_stats,
+       .ndo_validate_addr      = eth_validate_addr,
+       .ndo_set_multicast_list = cxgb_set_rxmode,
+       .ndo_do_ioctl           = cxgb_ioctl,
+       .ndo_change_mtu         = cxgb_change_mtu,
+       .ndo_set_mac_address    = cxgb_set_mac_addr,
+       .ndo_vlan_rx_register   = vlan_rx_register,
+#ifdef CONFIG_NET_POLL_CONTROLLER
+       .ndo_poll_controller    = cxgb_netpoll,
+#endif
+};
+
 static int __devinit init_one(struct pci_dev *pdev,
                              const struct pci_device_id *ent)
 {
@@ -2914,7 +2935,7 @@ static int __devinit init_one(struct pci_dev *pdev,
        for (i = 0; i < ai->nports; ++i) {
                struct net_device *netdev;
 
-               netdev = alloc_etherdev(sizeof(struct port_info));
+               netdev = alloc_etherdev_mq(sizeof(struct port_info), SGE_QSETS);
                if (!netdev) {
                        err = -ENOMEM;
                        goto out_free_dev;
@@ -2928,6 +2949,7 @@ static int __devinit init_one(struct pci_dev *pdev,
                pi->rx_csum_offload = 1;
                pi->port_id = i;
                netif_carrier_off(netdev);
+               netif_tx_stop_all_queues(netdev);
                netdev->irq = pdev->irq;
                netdev->mem_start = mmio_start;
                netdev->mem_end = mmio_start + mmio_len - 1;
@@ -2937,20 +2959,7 @@ static int __devinit init_one(struct pci_dev *pdev,
                        netdev->features |= NETIF_F_HIGHDMA;
 
                netdev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
-               netdev->vlan_rx_register = vlan_rx_register;
-
-               netdev->open = cxgb_open;
-               netdev->stop = cxgb_close;
-               netdev->hard_start_xmit = t3_eth_xmit;
-               netdev->get_stats = cxgb_get_stats;
-               netdev->set_multicast_list = cxgb_set_rxmode;
-               netdev->do_ioctl = cxgb_ioctl;
-               netdev->change_mtu = cxgb_change_mtu;
-               netdev->set_mac_address = cxgb_set_mac_addr;
-#ifdef CONFIG_NET_POLL_CONTROLLER
-               netdev->poll_controller = cxgb_netpoll;
-#endif
-
+               netdev->netdev_ops = &cxgb_netdev_ops;
                SET_ETHTOOL_OPS(netdev, &cxgb_ethtool_ops);
        }