Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 47eaa267 authored by Krzysztof Halasa's avatar Krzysztof Halasa Committed by Jeff Garzik
Browse files

Generic HDLC - use random_ether_addr() 



Generic HDLC now uses random_ether_addr() for generating MAC addresse
for Ethernet-alike interfaces.

Signed-off-by: default avatarKrzysztof Halasa <khc@pm.waw.pl>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 40d25142

drivers/net/wan/hdlc_fr.c

+3 −5
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ 
#include <linux/init.h>

#include <linux/skbuff.h>

#include <linux/pkt_sched.h>

#include <linux/random.h>

#include <linux/inetdevice.h>

#include <linux/lapb.h>

#include <linux/rtnetlink.h>
@@ -1120,10 +1119,9 @@ static int fr_add_pvc(struct net_device *frad, unsigned int dlci, int type) 
		return -ENOBUFS;

	}



	if (type == ARPHRD_ETHER) {

		memcpy(dev->dev_addr, "\x00\x01", 2);

                get_random_bytes(dev->dev_addr + 2, ETH_ALEN - 2);

	} else {

	if (type == ARPHRD_ETHER)

		random_ether_addr(dev->dev_addr);

	else {

		*(__be16*)dev->dev_addr = htons(dlci);

		dlci_to_q922(dev->broadcast, dlci);

	}

drivers/net/wan/hdlc_raw_eth.c

+1 −3
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
#include <linux/init.h>

#include <linux/skbuff.h>

#include <linux/pkt_sched.h>

#include <linux/random.h>

#include <linux/inetdevice.h>

#include <linux/lapb.h>

#include <linux/rtnetlink.h>
@@ -107,8 +106,7 @@ static int raw_eth_ioctl(struct net_device *dev, struct ifreq *ifr) 
		ether_setup(dev);

		dev->change_mtu = old_ch_mtu;

		dev->tx_queue_len = old_qlen;

		memcpy(dev->dev_addr, "\x00\x01", 2);

                get_random_bytes(dev->dev_addr + 2, ETH_ALEN - 2);

		random_ether_addr(dev->dev_addr);

		netif_dormant_off(dev);

		return 0;

	}