diff options
| author | Michael Chan <mchan@broadcom.com> | 2010-10-13 16:06:45 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-10-14 19:45:53 +0200 |
| commit | 6e0dda0c467d6c66d64c146170ea35399ec34c15 (patch) | |
| tree | e8416565ec89a1e805cb5357c812fd2845f4b1fc | |
| parent | cnic: Add common cnic_request_irq() (diff) | |
| download | linux-6e0dda0c467d6c66d64c146170ea35399ec34c15.tar.xz linux-6e0dda0c467d6c66d64c146170ea35399ec34c15.zip | |
cnic: Convert ctx_flags to bit fields
so that we can additional bit definitions without requiring a spinlock.
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/cnic.c | 4 | ||||
| -rw-r--r-- | drivers/net/cnic.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/cnic.c b/drivers/net/cnic.c index 0fab7203ffbd..311b2e6620d6 100644 --- a/drivers/net/cnic.c +++ b/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/drivers/net/cnic.h b/drivers/net/cnic.h index 676d008509c6..9907cc24807a 100644 --- a/drivers/net/cnic.h +++ b/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; |