OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1a9180a
)
cnic: Do not allow iSCSI and FCoE on bnx2x multi-function mode
author
Michael Chan
<mchan@broadcom.com>
Mon, 3 Jan 2011 15:21:45 +0000
(15:21 +0000)
committer
David S. Miller
<davem@davemloft.net>
Tue, 4 Jan 2011 03:08:07 +0000
(19:08 -0800)
Because the hardware does not yet support these in this mode.
Reviewed-by: Benjamin Li <benli@broadcom.com>
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/cnic.c
patch
|
blob
|
history
diff --git
a/drivers/net/cnic.c
b/drivers/net/cnic.c
index
4a9c628
..
41957fa
100644
(file)
--- a/
drivers/net/cnic.c
+++ b/
drivers/net/cnic.c
@@
-4826,12
+4826,8
@@
static void cnic_get_bnx2x_iscsi_info(struct cnic_dev *dev)
val = CNIC_RD(dev, addr);
val &= FUNC_MF_CFG_E1HOV_TAG_MASK;
if (val != FUNC_MF_CFG_E1HOV_TAG_DEFAULT) {
- addr = BNX2X_MF_CFG_ADDR(mf_cfg_addr,
- func_mf_config[func].config);
- val = CNIC_RD(dev, addr);
- val &= FUNC_MF_CFG_PROTOCOL_MASK;
- if (val != FUNC_MF_CFG_PROTOCOL_ISCSI)
- dev->max_iscsi_conn = 0;
+ dev->max_fcoe_conn = 0;
+ dev->max_iscsi_conn = 0;
}
}
if (!is_valid_ether_addr(dev->mac_addr))