|
@@ -2473,22 +2473,19 @@ static void mvneta_get_mac_addr(struct mvneta_port *pp, unsigned char *addr)
|
|
static int mvneta_set_mac_addr(struct net_device *dev, void *addr)
|
|
static int mvneta_set_mac_addr(struct net_device *dev, void *addr)
|
|
{
|
|
{
|
|
struct mvneta_port *pp = netdev_priv(dev);
|
|
struct mvneta_port *pp = netdev_priv(dev);
|
|
- u8 *mac = addr + 2;
|
|
|
|
- int i;
|
|
|
|
-
|
|
|
|
- if (netif_running(dev))
|
|
|
|
- return -EBUSY;
|
|
|
|
|
|
+ struct sockaddr *sockaddr = addr;
|
|
|
|
+ int ret;
|
|
|
|
|
|
|
|
+ ret = eth_prepare_mac_addr_change(dev, addr);
|
|
|
|
+ if (ret < 0)
|
|
|
|
+ return ret;
|
|
/* Remove previous address table entry */
|
|
/* Remove previous address table entry */
|
|
mvneta_mac_addr_set(pp, dev->dev_addr, -1);
|
|
mvneta_mac_addr_set(pp, dev->dev_addr, -1);
|
|
|
|
|
|
/* Set new addr in hw */
|
|
/* Set new addr in hw */
|
|
- mvneta_mac_addr_set(pp, mac, rxq_def);
|
|
|
|
-
|
|
|
|
- /* Set addr in the device */
|
|
|
|
- for (i = 0; i < ETH_ALEN; i++)
|
|
|
|
- dev->dev_addr[i] = mac[i];
|
|
|
|
|
|
+ mvneta_mac_addr_set(pp, sockaddr->sa_data, rxq_def);
|
|
|
|
|
|
|
|
+ eth_commit_mac_addr_change(dev, addr);
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -2583,8 +2580,6 @@ static int mvneta_open(struct net_device *dev)
|
|
struct mvneta_port *pp = netdev_priv(dev);
|
|
struct mvneta_port *pp = netdev_priv(dev);
|
|
int ret;
|
|
int ret;
|
|
|
|
|
|
- mvneta_mac_addr_set(pp, dev->dev_addr, rxq_def);
|
|
|
|
-
|
|
|
|
pp->pkt_size = MVNETA_RX_PKT_SIZE(pp->dev->mtu);
|
|
pp->pkt_size = MVNETA_RX_PKT_SIZE(pp->dev->mtu);
|
|
pp->frag_size = SKB_DATA_ALIGN(MVNETA_RX_BUF_SIZE(pp->pkt_size)) +
|
|
pp->frag_size = SKB_DATA_ALIGN(MVNETA_RX_BUF_SIZE(pp->pkt_size)) +
|
|
SKB_DATA_ALIGN(sizeof(struct skb_shared_info));
|
|
SKB_DATA_ALIGN(sizeof(struct skb_shared_info));
|