diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2021-11-22 18:35:32 +0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2021-11-22 18:35:32 +0300 |
| commit | 448cc2fb3a7b327823a9afd374808c37b8e6194f (patch) | |
| tree | a6d8ca3fa389980b47a495df2fb10892157c7dbc /drivers/net/wireless/ray_cs.c | |
| parent | 527bab0473f28236e4587c7870586275c1ef5516 (diff) | |
| parent | 136057256686de39cc3a07c2e39ef6bc43003ff6 (diff) | |
| download | linux-448cc2fb3a7b327823a9afd374808c37b8e6194f.tar.xz | |
Merge drm/drm-next into drm-intel-next
Sync up with drm-next to get v5.16-rc2.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/net/wireless/ray_cs.c')
| -rw-r--r-- | drivers/net/wireless/ray_cs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c index 0f5009c47cd0..e3a3dc3e45b4 100644 --- a/drivers/net/wireless/ray_cs.c +++ b/drivers/net/wireless/ray_cs.c @@ -791,7 +791,7 @@ static int ray_dev_init(struct net_device *dev) #endif /* RAY_IMMEDIATE_INIT */ /* copy mac and broadcast addresses to linux device */ - memcpy(dev->dev_addr, &local->sparm.b4.a_mac_addr, ADDRLEN); + eth_hw_addr_set(dev, local->sparm.b4.a_mac_addr); eth_broadcast_addr(dev->broadcast); dev_dbg(&link->dev, "ray_dev_init ending\n"); |