diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-05-03 04:24:55 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-05-03 04:24:55 -0400 |
| commit | 66fdc951720406deb3b0f17094cb16ec623f525d (patch) | |
| tree | 24f0ea4cc5d563e4e11cb3bdeb0ca86dd28e8cb6 /drivers/infiniband/hw/cxgb3/iwch_qp.c | |
| parent | f425752fc66acf1d4e47970ea704ed7d31c14173 (diff) | |
| parent | 7d27558c4138ac6b3684dea35c2f4379b940a7dd (diff) | |
Merge branch 'timers/clocksource' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip
Diffstat (limited to 'drivers/infiniband/hw/cxgb3/iwch_qp.c')
| -rw-r--r-- | drivers/infiniband/hw/cxgb3/iwch_qp.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/cxgb3/iwch_qp.c b/drivers/infiniband/hw/cxgb3/iwch_qp.c index 2f546a625330..27bbdc8e773a 100644 --- a/drivers/infiniband/hw/cxgb3/iwch_qp.c +++ b/drivers/infiniband/hw/cxgb3/iwch_qp.c | |||
| @@ -1069,7 +1069,6 @@ int iwch_modify_qp(struct iwch_dev *rhp, struct iwch_qp *qhp, | |||
| 1069 | goto out; | 1069 | goto out; |
| 1070 | } | 1070 | } |
| 1071 | qhp->attr.state = IWCH_QP_STATE_IDLE; | 1071 | qhp->attr.state = IWCH_QP_STATE_IDLE; |
| 1072 | memset(&qhp->attr, 0, sizeof(qhp->attr)); | ||
| 1073 | break; | 1072 | break; |
| 1074 | case IWCH_QP_STATE_TERMINATE: | 1073 | case IWCH_QP_STATE_TERMINATE: |
| 1075 | if (!internal) { | 1074 | if (!internal) { |