From cb623116d29d242a3fb6c34ceaa3c9b227e1e8b0 Mon Sep 17 00:00:00 2001 From: Michael Chan Date: Wed, 13 Oct 2010 14:06:45 +0000 Subject: [PATCH] --- yaml --- r: 215155 b: refs/heads/master c: 6e0dda0c467d6c66d64c146170ea35399ec34c15 h: refs/heads/master i: 215153: 1c285b1adc273c3650d1253808203b593f34a41a 215151: baffe7a24fdbe4960851e80b3a602b88bffd486e v: v3 --- [refs] | 2 +- trunk/drivers/net/cnic.c | 4 ++-- trunk/drivers/net/cnic.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 085cd92a241c..763281ed9b5e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6e0dc64384298b29ac17de7362b7d6d2ef588304 +refs/heads/master: 6e0dda0c467d6c66d64c146170ea35399ec34c15 diff --git a/trunk/drivers/net/cnic.c b/trunk/drivers/net/cnic.c index 0fab7203ffbd..311b2e6620d6 100644 --- a/trunk/drivers/net/cnic.c +++ b/trunk/drivers/net/cnic.c @@ -1721,7 +1721,7 @@ static int cnic_bnx2x_iscsi_destroy(struct cnic_dev *dev, struct kwqe *kwqe) struct kcqe *cqes[1]; u32 hw_cid, type; - if (!(ctx->ctx_flags & CTX_FL_OFFLD_START)) + if (!test_bit(CTX_FL_OFFLD_START, &ctx->ctx_flags)) goto skip_cfc_delete; while (!time_after(jiffies, ctx->timestamp + (2 * HZ))) @@ -1943,7 +1943,7 @@ static int cnic_bnx2x_connect(struct cnic_dev *dev, struct kwqe *wqes[], ret = cnic_submit_kwqe_16(dev, L5CM_RAMROD_CMD_ID_TCP_CONNECT, kwqe1->cid, ISCSI_CONNECTION_TYPE, &l5_data); if (!ret) - ctx->ctx_flags |= CTX_FL_OFFLD_START; + set_bit(CTX_FL_OFFLD_START, &ctx->ctx_flags); return ret; } diff --git a/trunk/drivers/net/cnic.h b/trunk/drivers/net/cnic.h index 676d008509c6..9907cc24807a 100644 --- a/trunk/drivers/net/cnic.h +++ b/trunk/drivers/net/cnic.h @@ -168,8 +168,8 @@ struct cnic_context { wait_queue_head_t waitq; int wait_cond; unsigned long timestamp; - u32 ctx_flags; -#define CTX_FL_OFFLD_START 0x00000001 + unsigned long ctx_flags; +#define CTX_FL_OFFLD_START 0 u8 ulp_proto_id; union { struct cnic_iscsi *iscsi;