summaryrefslogtreecommitdiffstats
path: root/drivers/net/cnic.c
diff options
context:
space:
mode:
authorMichael Chan <mchan@broadcom.com>2010-06-15 10:57:00 +0200
committerDavid S. Miller <davem@davemloft.net>2010-06-15 23:23:36 +0200
commited99daa5a0de4df9ed579ce36ff8b1373b6dbe47 (patch)
tree17aa9ff6f5311930c7f232f06c19edc16e8eb4f9 /drivers/net/cnic.c
parentixgbe: update set_rx_mode to fix issues w/ macvlan (diff)
downloadlinux-ed99daa5a0de4df9ed579ce36ff8b1373b6dbe47.tar.xz
linux-ed99daa5a0de4df9ed579ce36ff8b1373b6dbe47.zip
cnic: Return error code in cnic_cm_close() if unsuccessful.
So that bnx2i can handle the error condition immediately and not have to wait for timeout. Signed-off-by: Michael Chan <mchan@broadcom.com. Signed-off-by: Eddie Wai <waie@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/cnic.c')
-rw-r--r--drivers/net/cnic.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/cnic.c b/drivers/net/cnic.c
index 908d89a4fe86..b20e11cf5618 100644
--- a/drivers/net/cnic.c
+++ b/drivers/net/cnic.c
@@ -3026,6 +3026,8 @@ static int cnic_cm_close(struct cnic_sock *csk)
if (cnic_close_prep(csk)) {
csk->state = L4_KCQE_OPCODE_VALUE_CLOSE_COMP;
return cnic_cm_close_req(csk);
+ } else {
+ return -EALREADY;
}
return 0;
}