From 607cdd68036f0f645bfb4565b94dbf2ce2895001 Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Thu, 12 Jul 2012 22:33:10 -0700 Subject: [PATCH] --- yaml --- r: 315378 b: refs/heads/master c: 1833611d4efe4b99bb346aec40b827410a4de2e5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/s390/net/qeth_l2_main.c | 2 +- trunk/drivers/s390/net/qeth_l3_main.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 135d254239f6..a964544ffd4d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 344dc8ede105d4f6c3e410dd36ee5349a04e3929 +refs/heads/master: 1833611d4efe4b99bb346aec40b827410a4de2e5 diff --git a/trunk/drivers/s390/net/qeth_l2_main.c b/trunk/drivers/s390/net/qeth_l2_main.c index 426986518e96..b09355c14ee1 100644 --- a/trunk/drivers/s390/net/qeth_l2_main.c +++ b/trunk/drivers/s390/net/qeth_l2_main.c @@ -647,7 +647,7 @@ static int qeth_l2_request_initial_mac(struct qeth_card *card) } QETH_DBF_HEX(SETUP, 2, card->dev->dev_addr, OSA_ADDR_LEN); } else { - random_ether_addr(card->dev->dev_addr); + eth_random_addr(card->dev->dev_addr); memcpy(card->dev->dev_addr, vendor_pre, 3); } return 0; diff --git a/trunk/drivers/s390/net/qeth_l3_main.c b/trunk/drivers/s390/net/qeth_l3_main.c index 73ac63d901c9..bada7f66c146 100644 --- a/trunk/drivers/s390/net/qeth_l3_main.c +++ b/trunk/drivers/s390/net/qeth_l3_main.c @@ -1473,7 +1473,7 @@ static int qeth_l3_iqd_read_initial_mac_cb(struct qeth_card *card, memcpy(card->dev->dev_addr, cmd->data.create_destroy_addr.unique_id, ETH_ALEN); else - random_ether_addr(card->dev->dev_addr); + eth_random_addr(card->dev->dev_addr); return 0; }