diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2015-03-30 14:04:31 +0200 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2015-03-30 14:04:31 +0200 |
| commit | a23184ff45e565dc7275fa5b49aca4cd2762a4c6 (patch) | |
| tree | 8d47b65e6f94b45903cd032fc1926120adb8f9bd /drivers/scsi/fcoe/fcoe_ctlr.c | |
| parent | e797e34a3f7cb82c4e5b249a525c9e857ac6eebd (diff) | |
| parent | f1a60a56b7ac367b5285694cd02574e4edbe4c47 (diff) | |
Merge remote-tracking branch 'remotes/ubifs-v3.1/master' into tegra-nand-next
Conflicts:
drivers/mtd/ubi/ubi.h
drivers/mtd/ubi/wl.c
Diffstat (limited to 'drivers/scsi/fcoe/fcoe_ctlr.c')
| -rw-r--r-- | drivers/scsi/fcoe/fcoe_ctlr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/fcoe/fcoe_ctlr.c b/drivers/scsi/fcoe/fcoe_ctlr.c index c74c4b8e71ef..812c5b935363 100644 --- a/drivers/scsi/fcoe/fcoe_ctlr.c +++ b/drivers/scsi/fcoe/fcoe_ctlr.c @@ -2026,7 +2026,7 @@ static void fcoe_ctlr_vn_restart(struct fcoe_ctlr *fip) */ port_id = fip->port_id; if (fip->probe_tries) - port_id = prandom32(&fip->rnd_state) & 0xffff; + port_id = prandom_u32_state(&fip->rnd_state) & 0xffff; else if (!port_id) port_id = fip->lp->wwpn & 0xffff; if (!port_id || port_id == 0xffff) @@ -2051,7 +2051,7 @@ static void fcoe_ctlr_vn_restart(struct fcoe_ctlr *fip) static void fcoe_ctlr_vn_start(struct fcoe_ctlr *fip) { fip->probe_tries = 0; - prandom32_seed(&fip->rnd_state, fip->lp->wwpn); + prandom_seed_state(&fip->rnd_state, fip->lp->wwpn); fcoe_ctlr_vn_restart(fip); } |