diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2021-10-29 13:38:34 +0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2021-10-29 13:40:45 +0300 |
| commit | c1bb3a463dac815598362fb642a2746ff0e8f2f8 (patch) | |
| tree | 090d50f01c5c4e1e29b1d4398251745715e5a2a9 /include/linux/etherdevice.h | |
| parent | ead3ea12e133416fbd800eedb2fb5d0faf2df431 (diff) | |
| parent | 31fa8cbce4664946a1688898410fee41ad05364d (diff) | |
Merge drm/drm-next into drm-intel-next
Backmerge to get the DP 2.0 MST changes merged to drm-next. This also
syncs us up to v5.15-rc7.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'include/linux/etherdevice.h')
| -rw-r--r-- | include/linux/etherdevice.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/etherdevice.h b/include/linux/etherdevice.h index 928c411bd509..c58d50451485 100644 --- a/include/linux/etherdevice.h +++ b/include/linux/etherdevice.h @@ -308,7 +308,7 @@ static inline void ether_addr_copy(u8 *dst, const u8 *src) */ static inline void eth_hw_addr_set(struct net_device *dev, const u8 *addr) { - ether_addr_copy(dev->dev_addr, addr); + __dev_addr_set(dev, addr, ETH_ALEN); } /** |