projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
netdev: Abstract "features" interface away from OpenFlow 1.0.
[openvswitch]
/
datapath
/
vport-internal_dev.c
diff --git
a/datapath/vport-internal_dev.c
b/datapath/vport-internal_dev.c
index 46b78d226d20d5729b05b7a3bb1fda91c2f26d4d..9647a617c9f57d1f7ee20e973dffb60c82511f86 100644
(file)
--- a/
datapath/vport-internal_dev.c
+++ b/
datapath/vport-internal_dev.c
@@
-87,6
+87,9
@@
static int internal_dev_mac_addr(struct net_device *dev, void *p)
if (!is_valid_ether_addr(addr->sa_data))
return -EADDRNOTAVAIL;
if (!is_valid_ether_addr(addr->sa_data))
return -EADDRNOTAVAIL;
+#ifdef NET_ADDR_RANDOM
+ dev->addr_assign_type &= ~NET_ADDR_RANDOM;
+#endif
memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
return 0;
}
memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
return 0;
}
@@
-213,7
+216,7
@@
static void do_setup(struct net_device *netdev)
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)
netdev->hw_features = netdev->features & ~NETIF_F_LLTX;
#endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)
netdev->hw_features = netdev->features & ~NETIF_F_LLTX;
#endif
-
random_ether_addr(netdev->dev_addr
);
+
eth_hw_addr_random(netdev
);
}
static struct vport *internal_dev_create(const struct vport_parms *parms)
}
static struct vport *internal_dev_create(const struct vport_parms *parms)