projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[linux-2.6-block.git]
/
drivers
/
net
/
ethernet
/
qlogic
/
qlcnic
/
qlcnic_ethtool.c
diff --git
a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
index 66355b72818c6450167289b24bddfce3f6bed91b..b2a8805997ca98ccde591cd05dc0b2951470ef19 100644
(file)
--- a/
drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
+++ b/
drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
@@
-691,7
+691,7
@@
static int qlcnic_set_channels(struct net_device *dev,
return err;
}
- if (channel->tx_count) {
+ if (
qlcnic_82xx_check(adapter) &&
channel->tx_count) {
err = qlcnic_validate_max_tx_rings(adapter, channel->tx_count);
if (err)
return err;