aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorSathya Perla <sathya.perla@emulex.com>2010-12-01 01:03:36 +0000
committerDavid S. Miller <davem@davemloft.net>2010-12-06 12:59:08 -0800
commit359a972fae84242efa26b86bf09c3ac3784405ba (patch)
treeee9fc71f033e627b14c3a9b8a9101a195ed805f2 /drivers/net
parentbe2net: Fix be_dev_family_check() return value check (diff)
downloadlinux-dev-359a972fae84242efa26b86bf09c3ac3784405ba.tar.xz
linux-dev-359a972fae84242efa26b86bf09c3ac3784405ba.zip
be2net: FW init cmd fix for lancer
Lancer can use the same pattern as BE to indicate a driver load to the FW. Signed-off-by: Padmanabh Ratnakar <padmanabh.ratnakar@emulex.com> Signed-off-by: Sathya Perla <sathya.perla@emulex.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/benet/be_cmds.c27
1 files changed, 8 insertions, 19 deletions
diff --git a/drivers/net/benet/be_cmds.c b/drivers/net/benet/be_cmds.c
index 3865b2bc65e6..31c5ddc08fc8 100644
--- a/drivers/net/benet/be_cmds.c
+++ b/drivers/net/benet/be_cmds.c
@@ -470,25 +470,14 @@ int be_cmd_fw_init(struct be_adapter *adapter)
spin_lock(&adapter->mbox_lock);
wrb = (u8 *)wrb_from_mbox(adapter);
- if (lancer_chip(adapter)) {
- *wrb++ = 0xFF;
- *wrb++ = 0x34;
- *wrb++ = 0x12;
- *wrb++ = 0xFF;
- *wrb++ = 0xFF;
- *wrb++ = 0x78;
- *wrb++ = 0x56;
- *wrb = 0xFF;
- } else {
- *wrb++ = 0xFF;
- *wrb++ = 0x12;
- *wrb++ = 0x34;
- *wrb++ = 0xFF;
- *wrb++ = 0xFF;
- *wrb++ = 0x56;
- *wrb++ = 0x78;
- *wrb = 0xFF;
- }
+ *wrb++ = 0xFF;
+ *wrb++ = 0x12;
+ *wrb++ = 0x34;
+ *wrb++ = 0xFF;
+ *wrb++ = 0xFF;
+ *wrb++ = 0x56;
+ *wrb++ = 0x78;
+ *wrb = 0xFF;
status = be_mbox_notify_wait(adapter);