| developer | 7e32f7e | 2022-05-18 21:10:08 +0800 | [diff] [blame] | 1 | From 8bc7823ed3bd5b87765e1b3d6f72c69624680921 Mon Sep 17 00:00:00 2001 |
| 2 | From: Jakub Kicinski <kuba@kernel.org> |
| 3 | Date: Fri, 22 Oct 2021 16:21:02 -0700 |
| 4 | Subject: net: drivers: get ready for const netdev->dev_addr |
| 5 | |
| 6 | Commit 406f42fa0d3c ("net-next: When a bond have a massive amount |
| 7 | of VLANs...") introduced a rbtree for faster Ethernet address look |
| 8 | up. To maintain netdev->dev_addr in this tree we need to make all |
| 9 | the writes to it go through appropriate helpers. We will make |
| 10 | netdev->dev_addr a const. |
| 11 | |
| 12 | Make sure local references to netdev->dev_addr are constant. |
| 13 | |
| 14 | Signed-off-by: Jakub Kicinski <kuba@kernel.org> |
| 15 | Signed-off-by: David S. Miller <davem@davemloft.net> |
| 16 | --- |
| 17 | drivers/net/macsec.c | 2 +- |
| 18 | drivers/net/macvlan.c | 3 ++- |
| 19 | drivers/net/vmxnet3/vmxnet3_drv.c | 4 ++-- |
| 20 | 3 files changed, 5 insertions(+), 4 deletions(-) |
| 21 | |
| 22 | diff --git a/drivers/net/macsec.c b/drivers/net/macsec.c |
| 23 | index 18b6dba9394e8..16aa3a478e9e8 100644 |
| 24 | --- a/drivers/net/macsec.c |
| 25 | +++ b/drivers/net/macsec.c |
| 26 | @@ -250,7 +250,7 @@ static bool send_sci(const struct macsec_secy *secy) |
| 27 | (secy->n_rx_sc > 1 && !tx_sc->end_station && !tx_sc->scb); |
| 28 | } |
| 29 | |
| 30 | -static sci_t make_sci(u8 *addr, __be16 port) |
| 31 | +static sci_t make_sci(const u8 *addr, __be16 port) |
| 32 | { |
| 33 | sci_t sci; |
| 34 | |
| 35 | diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c |
| 36 | index 6189acb33973c..d2f830ec2969c 100644 |
| 37 | --- a/drivers/net/macvlan.c |
| 38 | +++ b/drivers/net/macvlan.c |
| 39 | @@ -698,7 +698,8 @@ hash_del: |
| 40 | return 0; |
| 41 | } |
| 42 | |
| 43 | -static int macvlan_sync_address(struct net_device *dev, unsigned char *addr) |
| 44 | +static int macvlan_sync_address(struct net_device *dev, |
| 45 | + const unsigned char *addr) |
| 46 | { |
| 47 | struct macvlan_dev *vlan = netdev_priv(dev); |
| 48 | struct net_device *lowerdev = vlan->lowerdev; |
| 49 | diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c |
| 50 | index 7a205ddf0060a..3e1b7746cce44 100644 |
| 51 | --- a/drivers/net/vmxnet3/vmxnet3_drv.c |
| 52 | +++ b/drivers/net/vmxnet3/vmxnet3_drv.c |
| 53 | @@ -46,7 +46,7 @@ MODULE_DEVICE_TABLE(pci, vmxnet3_pciid_table); |
| 54 | static int enable_mq = 1; |
| 55 | |
| 56 | static void |
| 57 | -vmxnet3_write_mac_addr(struct vmxnet3_adapter *adapter, u8 *mac); |
| 58 | +vmxnet3_write_mac_addr(struct vmxnet3_adapter *adapter, const u8 *mac); |
| 59 | |
| 60 | /* |
| 61 | * Enable/Disable the given intr |
| 62 | @@ -2806,7 +2806,7 @@ vmxnet3_quiesce_dev(struct vmxnet3_adapter *adapter) |
| 63 | |
| 64 | |
| 65 | static void |
| 66 | -vmxnet3_write_mac_addr(struct vmxnet3_adapter *adapter, u8 *mac) |
| 67 | +vmxnet3_write_mac_addr(struct vmxnet3_adapter *adapter, const u8 *mac) |
| 68 | { |
| 69 | u32 tmp; |
| 70 | |
| 71 | -- |
| 72 | cgit 1.2.3-1.el7 |
| 73 | |