diff --git a/[refs] b/[refs] index 582829bc41e7..dc34d8950fcd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 63657b9c319588cd35ed869e19cc6255dbef0d20 +refs/heads/master: 359a972fae84242efa26b86bf09c3ac3784405ba diff --git a/trunk/drivers/net/benet/be_cmds.c b/trunk/drivers/net/benet/be_cmds.c index 3865b2bc65e6..31c5ddc08fc8 100644 --- a/trunk/drivers/net/benet/be_cmds.c +++ b/trunk/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);