diff options
Diffstat (limited to 'net/openvswitch/vport-internal_dev.c')
-rw-r--r-- | net/openvswitch/vport-internal_dev.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/openvswitch/vport-internal_dev.c b/net/openvswitch/vport-internal_dev.c index 5d460c37df07..0531de6c7a4a 100644 --- a/net/openvswitch/vport-internal_dev.c +++ b/net/openvswitch/vport-internal_dev.c | |||
@@ -69,7 +69,6 @@ static int internal_dev_mac_addr(struct net_device *dev, void *p) | |||
69 | 69 | ||
70 | if (!is_valid_ether_addr(addr->sa_data)) | 70 | if (!is_valid_ether_addr(addr->sa_data)) |
71 | return -EADDRNOTAVAIL; | 71 | return -EADDRNOTAVAIL; |
72 | dev->addr_assign_type &= ~NET_ADDR_RANDOM; | ||
73 | memcpy(dev->dev_addr, addr->sa_data, dev->addr_len); | 72 | memcpy(dev->dev_addr, addr->sa_data, dev->addr_len); |
74 | return 0; | 73 | return 0; |
75 | } | 74 | } |
@@ -98,7 +97,7 @@ static int internal_dev_stop(struct net_device *netdev) | |||
98 | static void internal_dev_getinfo(struct net_device *netdev, | 97 | static void internal_dev_getinfo(struct net_device *netdev, |
99 | struct ethtool_drvinfo *info) | 98 | struct ethtool_drvinfo *info) |
100 | { | 99 | { |
101 | strcpy(info->driver, "openvswitch"); | 100 | strlcpy(info->driver, "openvswitch", sizeof(info->driver)); |
102 | } | 101 | } |
103 | 102 | ||
104 | static const struct ethtool_ops internal_dev_ethtool_ops = { | 103 | static const struct ethtool_ops internal_dev_ethtool_ops = { |