aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/cxgb3/cxgb3_main.c
diff options
context:
space:
mode:
authorDivy Le Ray <divy@chelsio.com>2009-03-26 12:39:24 -0400
committerDavid S. Miller <davem@davemloft.net>2009-03-27 03:46:58 -0400
commit952cdf333f9d1b0b71f1b9a3c5e421a2673ed7de (patch)
tree131202c4c8f50f1cedf52529d6a3e6f70dbfaa38 /drivers/net/cxgb3/cxgb3_main.c
parent68f40c10292a94762956896d4d320a2620945adc (diff)
cxgb3: differentiate portx and Tx channels
Separate ports from H/W Tx channels. Signed-off-by: Divy Le Ray <divy@chelsio.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/cxgb3/cxgb3_main.c')
-rw-r--r--[-rwxr-xr-x]drivers/net/cxgb3/cxgb3_main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c
index e2b119312a00..2c2aaa741450 100755..100644
--- a/drivers/net/cxgb3/cxgb3_main.c
+++ b/drivers/net/cxgb3/cxgb3_main.c
@@ -3086,7 +3086,7 @@ static int __devinit init_one(struct pci_dev *pdev,
3086 INIT_WORK(&adapter->fatal_error_handler_task, fatal_error_task); 3086 INIT_WORK(&adapter->fatal_error_handler_task, fatal_error_task);
3087 INIT_DELAYED_WORK(&adapter->adap_check_task, t3_adap_check_task); 3087 INIT_DELAYED_WORK(&adapter->adap_check_task, t3_adap_check_task);
3088 3088
3089 for (i = 0; i < ai->nports; ++i) { 3089 for (i = 0; i < ai->nports0 + ai->nports1; ++i) {
3090 struct net_device *netdev; 3090 struct net_device *netdev;
3091 3091
3092 netdev = alloc_etherdev_mq(sizeof(struct port_info), SGE_QSETS); 3092 netdev = alloc_etherdev_mq(sizeof(struct port_info), SGE_QSETS);
@@ -3176,7 +3176,7 @@ static int __devinit init_one(struct pci_dev *pdev,
3176 3176
3177out_free_dev: 3177out_free_dev:
3178 iounmap(adapter->regs); 3178 iounmap(adapter->regs);
3179 for (i = ai->nports - 1; i >= 0; --i) 3179 for (i = ai->nports0 + ai->nports1 - 1; i >= 0; --i)
3180 if (adapter->port[i]) 3180 if (adapter->port[i])
3181 free_netdev(adapter->port[i]); 3181 free_netdev(adapter->port[i]);
3182 3182