diff options
| author | Andy Voltz <andy.voltz@timesys.com> | 2010-11-15 16:00:38 -0500 |
|---|---|---|
| committer | Andy Voltz <andy.voltz@timesys.com> | 2010-11-17 11:30:34 -0500 |
| commit | 2e0ae4bf137e282e825b27b02eb46f86c59d004e (patch) | |
| tree | 7c2534acd757ca414f02c5b983ee67eb2b2493c6 /drivers/net/cxgb3/cxgb3_main.c | |
| parent | 22763c5cf3690a681551162c15d34d935308c8d7 (diff) | |
Bump Linux kernel to 2.6.32.25
Diffstat (limited to 'drivers/net/cxgb3/cxgb3_main.c')
| -rw-r--r-- | drivers/net/cxgb3/cxgb3_main.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c index 34e776c5f06b..2b378e75b1b0 100644 --- a/drivers/net/cxgb3/cxgb3_main.c +++ b/drivers/net/cxgb3/cxgb3_main.c @@ -1274,6 +1274,7 @@ static void cxgb_down(struct adapter *adapter) free_irq_resources(adapter); quiesce_rx(adapter); + t3_sge_stop(adapter); flush_workqueue(cxgb3_wq); /* wait for external IRQ handler */ } @@ -2274,6 +2275,8 @@ static int cxgb_extension_ioctl(struct net_device *dev, void __user *useraddr) case CHELSIO_GET_QSET_NUM:{ struct ch_reg edata; + memset(&edata, 0, sizeof(struct ch_reg)); + edata.cmd = CHELSIO_GET_QSET_NUM; edata.val = pi->nqsets; if (copy_to_user(useraddr, &edata, sizeof(edata))) |