From fb6083d790438c373c085d8febe73b48929c6190 Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Thu, 12 Jul 2012 22:33:11 -0700 Subject: [PATCH] --- yaml --- r: 315379 b: refs/heads/master c: 006c9139f7a90d3419381a59ac76f42612f94c14 h: refs/heads/master i: 315377: ba63ac8d51446ec488ce0fd84eb792484868b71e 315375: d4e257e3a9f0dd2cd9d9eb59600855cbbecf64bf v: v3 --- [refs] | 2 +- trunk/drivers/usb/atm/xusbatm.c | 4 ++-- trunk/drivers/usb/gadget/u_ether.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a964544ffd4d..c435928a1998 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1833611d4efe4b99bb346aec40b827410a4de2e5 +refs/heads/master: 006c9139f7a90d3419381a59ac76f42612f94c14 diff --git a/trunk/drivers/usb/atm/xusbatm.c b/trunk/drivers/usb/atm/xusbatm.c index 14ec9f0c5924..b3b1bb78b2ef 100644 --- a/trunk/drivers/usb/atm/xusbatm.c +++ b/trunk/drivers/usb/atm/xusbatm.c @@ -20,7 +20,7 @@ ******************************************************************************/ #include -#include /* for random_ether_addr() */ +#include /* for eth_random_addr() */ #include "usbatm.h" @@ -163,7 +163,7 @@ static int xusbatm_atm_start(struct usbatm_data *usbatm, atm_dbg(usbatm, "%s entered\n", __func__); /* use random MAC as we've no way to get it from the device */ - random_ether_addr(atm_dev->esi); + eth_random_addr(atm_dev->esi); return 0; } diff --git a/trunk/drivers/usb/gadget/u_ether.c b/trunk/drivers/usb/gadget/u_ether.c index 47cf48b51c9d..b9e1925b2df0 100644 --- a/trunk/drivers/usb/gadget/u_ether.c +++ b/trunk/drivers/usb/gadget/u_ether.c @@ -724,7 +724,7 @@ static int get_ether_addr(const char *str, u8 *dev_addr) if (is_valid_ether_addr(dev_addr)) return 0; } - random_ether_addr(dev_addr); + eth_random_addr(dev_addr); return 1; }