git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[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
f208712
..
4e3c123
100644
(file)
--- a/
drivers/net/cxgb3/cxgb3_main.c
+++ b/
drivers/net/cxgb3/cxgb3_main.c
@@
-1266,11
+1266,13
@@
static int cxgb_up(struct adapter *adap)
}
if (!(adap->flags & QUEUES_BOUND)) {
}
if (!(adap->flags & QUEUES_BOUND)) {
- err = bind_qsets(adap);
- if (err) {
- CH_ERR(adap, "failed to bind qsets, err %d\n", err);
+ int ret = bind_qsets(adap);
+
+ if (ret < 0) {
+ CH_ERR(adap, "failed to bind qsets, err %d\n", ret);
t3_intr_disable(adap);
free_irq_resources(adap);
t3_intr_disable(adap);
free_irq_resources(adap);
+ err = ret;
goto out;
}
adap->flags |= QUEUES_BOUND;
goto out;
}
adap->flags |= QUEUES_BOUND;
@@
-1286,7
+1288,7
@@
irq_err:
/*
* Release resources when all the ports and offloading have been stopped.
*/
/*
* Release resources when all the ports and offloading have been stopped.
*/
-static void cxgb_down(struct adapter *adapter)
+static void cxgb_down(struct adapter *adapter
, int on_wq
)
{
t3_sge_stop(adapter);
spin_lock_irq(&adapter->work_lock); /* sync with PHY intr task */
{
t3_sge_stop(adapter);
spin_lock_irq(&adapter->work_lock); /* sync with PHY intr task */
@@
-1296,7
+1298,8
@@
static void cxgb_down(struct adapter *adapter)
free_irq_resources(adapter);
quiesce_rx(adapter);
t3_sge_stop(adapter);
free_irq_resources(adapter);
quiesce_rx(adapter);
t3_sge_stop(adapter);
- flush_workqueue(cxgb3_wq); /* wait for external IRQ handler */
+ if (!on_wq)
+ flush_workqueue(cxgb3_wq);/* wait for external IRQ handler */
}
static void schedule_chk_task(struct adapter *adap)
}
static void schedule_chk_task(struct adapter *adap)
@@
-1374,7
+1377,7
@@
static int offload_close(struct t3cdev *tdev)
clear_bit(OFFLOAD_DEVMAP_BIT, &adapter->open_device_map);
if (!adapter->open_device_map)
clear_bit(OFFLOAD_DEVMAP_BIT, &adapter->open_device_map);
if (!adapter->open_device_map)
- cxgb_down(adapter);
+ cxgb_down(adapter
, 0
);
cxgb3_offload_deactivate(adapter);
return 0;
cxgb3_offload_deactivate(adapter);
return 0;
@@
-1398,7
+1401,10
@@
static int cxgb_open(struct net_device *dev)
"Could not initialize offload capabilities\n");
}
"Could not initialize offload capabilities\n");
}
- dev->real_num_tx_queues = pi->nqsets;
+ netif_set_real_num_tx_queues(dev, pi->nqsets);
+ err = netif_set_real_num_rx_queues(dev, pi->nqsets);
+ if (err)
+ return err;
link_start(dev);
t3_port_intr_enable(adapter, pi->port_id);
netif_tx_start_all_queues(dev);
link_start(dev);
t3_port_intr_enable(adapter, pi->port_id);
netif_tx_start_all_queues(dev);
@@
-1409,7
+1415,7
@@
static int cxgb_open(struct net_device *dev)
return 0;
}
return 0;
}
-static int
cxgb_close(struct net_device *dev
)
+static int
__cxgb_close(struct net_device *dev, int on_wq
)
{
struct port_info *pi = netdev_priv(dev);
struct adapter *adapter = pi->adapter;
{
struct port_info *pi = netdev_priv(dev);
struct adapter *adapter = pi->adapter;
@@
-1436,12
+1442,17
@@
static int cxgb_close(struct net_device *dev)
cancel_delayed_work_sync(&adapter->adap_check_task);
if (!adapter->open_device_map)
cancel_delayed_work_sync(&adapter->adap_check_task);
if (!adapter->open_device_map)
- cxgb_down(adapter);
+ cxgb_down(adapter
, on_wq
);
cxgb3_event_notify(&adapter->tdev, OFFLOAD_PORT_DOWN, pi->port_id);
return 0;
}
cxgb3_event_notify(&adapter->tdev, OFFLOAD_PORT_DOWN, pi->port_id);
return 0;
}
+static int cxgb_close(struct net_device *dev)
+{
+ return __cxgb_close(dev, 0);
+}
+
static struct net_device_stats *cxgb_get_stats(struct net_device *dev)
{
struct port_info *pi = netdev_priv(dev);
static struct net_device_stats *cxgb_get_stats(struct net_device *dev)
{
struct port_info *pi = netdev_priv(dev);
@@
-2864,7
+2875,7
@@
void t3_os_link_fault_handler(struct adapter *adapter, int port_id)
spin_unlock(&adapter->work_lock);
}
spin_unlock(&adapter->work_lock);
}
-static int t3_adapter_error(struct adapter *adapter, int reset)
+static int t3_adapter_error(struct adapter *adapter, int reset
, int on_wq
)
{
int i, ret = 0;
{
int i, ret = 0;
@@
-2879,7
+2890,7
@@
static int t3_adapter_error(struct adapter *adapter, int reset)
struct net_device *netdev = adapter->port[i];
if (netif_running(netdev))
struct net_device *netdev = adapter->port[i];
if (netif_running(netdev))
-
cxgb_close(netdev
);
+
__cxgb_close(netdev, on_wq
);
}
/* Stop SGE timers */
}
/* Stop SGE timers */
@@
-2950,7
+2961,7
@@
static void fatal_error_task(struct work_struct *work)
int err = 0;
rtnl_lock();
int err = 0;
rtnl_lock();
- err = t3_adapter_error(adapter, 1);
+ err = t3_adapter_error(adapter, 1
, 1
);
if (!err)
err = t3_reenable_adapter(adapter);
if (!err)
if (!err)
err = t3_reenable_adapter(adapter);
if (!err)
@@
-3000,7
+3011,7
@@
static pci_ers_result_t t3_io_error_detected(struct pci_dev *pdev,
if (state == pci_channel_io_perm_failure)
return PCI_ERS_RESULT_DISCONNECT;
if (state == pci_channel_io_perm_failure)
return PCI_ERS_RESULT_DISCONNECT;
- ret = t3_adapter_error(adapter, 0);
+ ret = t3_adapter_error(adapter, 0
, 0
);
/* Request a slot reset. */
return PCI_ERS_RESULT_NEED_RESET;
/* Request a slot reset. */
return PCI_ERS_RESULT_NEED_RESET;