From ba63ac8d51446ec488ce0fd84eb792484868b71e Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Thu, 12 Jul 2012 19:33:09 +0000 Subject: [PATCH] --- yaml --- r: 315377 b: refs/heads/master c: 344dc8ede105d4f6c3e410dd36ee5349a04e3929 h: refs/heads/master i: 315375: d4e257e3a9f0dd2cd9d9eb59600855cbbecf64bf v: v3 --- [refs] | 2 +- trunk/drivers/net/tun.c | 2 +- trunk/drivers/net/wimax/i2400m/driver.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 504701732417..135d254239f6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f4f7f4143cf7d6a31bc9797f00f765d0174603cb +refs/heads/master: 344dc8ede105d4f6c3e410dd36ee5349a04e3929 diff --git a/trunk/drivers/net/tun.c b/trunk/drivers/net/tun.c index 987aeefbc774..961fad1f7053 100644 --- a/trunk/drivers/net/tun.c +++ b/trunk/drivers/net/tun.c @@ -22,7 +22,7 @@ * Add TUNSETLINK ioctl to set the link encapsulation * * Mark Smith - * Use random_ether_addr() for tap MAC address. + * Use eth_random_addr() for tap MAC address. * * Harald Roelle 2004/04/20 * Fixes in packet dropping, queue length setting and queue wakeup. diff --git a/trunk/drivers/net/wimax/i2400m/driver.c b/trunk/drivers/net/wimax/i2400m/driver.c index 850b8bc38bee..025426132754 100644 --- a/trunk/drivers/net/wimax/i2400m/driver.c +++ b/trunk/drivers/net/wimax/i2400m/driver.c @@ -896,7 +896,7 @@ int i2400m_setup(struct i2400m *i2400m, enum i2400m_bri bm_flags) result = i2400m_read_mac_addr(i2400m); if (result < 0) goto error_read_mac_addr; - random_ether_addr(i2400m->src_mac_addr); + eth_random_addr(i2400m->src_mac_addr); i2400m->pm_notifier.notifier_call = i2400m_pm_notifier; register_pm_notifier(&i2400m->pm_notifier);