media: use eth_hw_addr_set()

Commit 406f42fa0d3c ("net-next: When a bond have a massive amount
of VLANs...") introduced a rbtree for faster Ethernet address look
up. To maintain netdev->dev_addr in this tree we need to make all
the writes to it go through appropriate helpers.

Convert media from memcpy(... 6) and memcpy(... addr_len) to
eth_hw_addr_set():

  @@
  expression dev, np;
  @@
  - memcpy(dev->dev_addr, np, 6)
  + eth_hw_addr_set(dev, np)
  @@
  - memcpy(dev->dev_addr, np, dev->addr_len)
  + eth_hw_addr_set(dev, np)

Make sure we don't cast off const qualifier from dev->dev_addr.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/media/dvb-core/dvb_net.c b/drivers/media/dvb-core/dvb_net.c
index dddebea..8a2febf 100644 (file)
--- a/drivers/media/dvb-core/dvb_net.c
+++ b/drivers/media/dvb-core/dvb_net.c
@@ -1008,7 +1008,7 @@ static u8 mask_promisc[6]={0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 
 static int dvb_net_filter_sec_set(struct net_device *dev,
                   struct dmx_section_filter **secfilter,
-                  u8 *mac, u8 *mac_mask)
+                  const u8 *mac, u8 *mac_mask)
 {
        struct dvb_net_priv *priv = netdev_priv(dev);
        int ret;
@@ -1052,7 +1052,7 @@ static int dvb_net_feed_start(struct net_device *dev)
        int ret = 0, i;
        struct dvb_net_priv *priv = netdev_priv(dev);
        struct dmx_demux *demux = priv->demux;
-       unsigned char *mac = (unsigned char *) dev->dev_addr;
+       const unsigned char *mac = (const unsigned char *) dev->dev_addr;
 
        netdev_dbg(dev, "rx_mode %i\n", priv->rx_mode);
        mutex_lock(&priv->mutex);
@@ -1272,7 +1272,7 @@ static int dvb_net_set_mac (struct net_device *dev, void *p)
        struct dvb_net_priv *priv = netdev_priv(dev);
        struct sockaddr *addr=p;
 
-       memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
+       eth_hw_addr_set(dev, addr->sa_data);
 
        if (netif_running(dev))
                schedule_work(&priv->restart_net_feed_wq);
@@ -1367,7 +1367,7 @@ static int dvb_net_add_if(struct dvb_net *dvbnet, u16 pid, u8 feedtype)
                         dvbnet->dvbdev->adapter->num, if_num);
 
        net->addr_len = 6;
-       memcpy(net->dev_addr, dvbnet->dvbdev->adapter->proposed_mac, 6);
+       eth_hw_addr_set(net, dvbnet->dvbdev->adapter->proposed_mac);
 
        dvbnet->device[if_num] = net;