lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cnic: Convert ctx_flags to bit fields

Browse Source 
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>
This commit is contained in:
Michael Chan
2010-10-13 14:06:45 +00:00
committed by David S. Miller
parent 6e0dc64384
commit 6e0dda0c46
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/cnic.c
View File

@@ -1721,7 +1721,7 @@ static int cnic_bnx2x_iscsi_destroy(struct cnic_dev *dev, struct kwqe *kwqe)
struct kcqe *cqes[1]; struct kcqe *cqes[1];
u32 hw_cid, type; 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; goto skip_cfc_delete;
while (!time_after(jiffies, ctx->timestamp + (2 * HZ))) 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, ret = cnic_submit_kwqe_16(dev, L5CM_RAMROD_CMD_ID_TCP_CONNECT,
kwqe1->cid, ISCSI_CONNECTION_TYPE, &l5_data); kwqe1->cid, ISCSI_CONNECTION_TYPE, &l5_data);
if (!ret) if (!ret)
ctx->ctx_flags |= CTX_FL_OFFLD_START; set_bit(CTX_FL_OFFLD_START, &ctx->ctx_flags);
return ret; return ret;
} }

4
drivers/net/cnic.h
View File

@@ -168,8 +168,8 @@ struct cnic_context {
wait_queue_head_t waitq; wait_queue_head_t waitq;
int wait_cond; int wait_cond;
unsigned long timestamp; unsigned long timestamp;
u32 ctx_flags; unsigned long ctx_flags;
#define CTX_FL_OFFLD_START 0x00000001 #define CTX_FL_OFFLD_START 0
u8 ulp_proto_id; u8 ulp_proto_id;
union { union {
struct cnic_iscsi *iscsi; struct cnic_iscsi *iscsi;