diff options
| author | David S. Miller <davem@davemloft.net> | 2010-09-27 04:03:03 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-09-27 04:03:03 -0400 |
| commit | e40051d134f7ee95c8c1f7a3471e84eafc9ab326 (patch) | |
| tree | 88eb44e49a75721ae926665a2c42f08badac9d07 /drivers/net/cxgb3 | |
| parent | 42099d7a3941d4aaf853caac92b3ae76149fc6e7 (diff) | |
| parent | 2cc6d2bf3d6195fabcf0febc192c01f99519a8f3 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/qlcnic/qlcnic_init.c
net/ipv4/ip_output.c
Diffstat (limited to 'drivers/net/cxgb3')
| -rw-r--r-- | drivers/net/cxgb3/cxgb3_main.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c index 1ecf53dafe06..f9eede0a4b86 100644 --- a/drivers/net/cxgb3/cxgb3_main.c +++ b/drivers/net/cxgb3/cxgb3_main.c | |||
| @@ -2302,6 +2302,8 @@ static int cxgb_extension_ioctl(struct net_device *dev, void __user *useraddr) | |||
| 2302 | case CHELSIO_GET_QSET_NUM:{ | 2302 | case CHELSIO_GET_QSET_NUM:{ |
| 2303 | struct ch_reg edata; | 2303 | struct ch_reg edata; |
| 2304 | 2304 | ||
| 2305 | memset(&edata, 0, sizeof(struct ch_reg)); | ||
| 2306 | |||
| 2305 | edata.cmd = CHELSIO_GET_QSET_NUM; | 2307 | edata.cmd = CHELSIO_GET_QSET_NUM; |
| 2306 | edata.val = pi->nqsets; | 2308 | edata.val = pi->nqsets; |
| 2307 | if (copy_to_user(useraddr, &edata, sizeof(edata))) | 2309 | if (copy_to_user(useraddr, &edata, sizeof(edata))) |