diff options
| author | Dmitry Bogdanov <dbogdanov@marvell.com> | 2020-03-10 18:22:24 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-03-18 07:17:40 +0100 |
| commit | f815f9a8953685d1ee1b3171ad97cb5b45c7403f (patch) | |
| tree | 064e6a41f10b7deafd02a9e4904c4d1aa419cea8 /drivers/net/macsec.c | |
| parent | 04f430a90bf0248ac95390701ecd605373357201 (diff) | |
| download | linux-f815f9a8953685d1ee1b3171ad97cb5b45c7403f.tar.gz linux-f815f9a8953685d1ee1b3171ad97cb5b45c7403f.tar.bz2 linux-f815f9a8953685d1ee1b3171ad97cb5b45c7403f.zip | |
net: macsec: update SCI upon MAC address change.
[ Upstream commit 6fc498bc82929ee23aa2f35a828c6178dfd3f823 ]
SCI should be updated, because it contains MAC in its first 6 octets.
Fixes: c09440f7dcb3 ("macsec: introduce IEEE 802.1AE driver")
Signed-off-by: Dmitry Bogdanov <dbogdanov@marvell.com>
Signed-off-by: Mark Starovoytov <mstarovoitov@marvell.com>
Signed-off-by: Igor Russkikh <irusskikh@marvell.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/macsec.c')
| -rw-r--r-- | drivers/net/macsec.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/net/macsec.c b/drivers/net/macsec.c index afd8b2a08245..3221c3b4efb1 100644 --- a/drivers/net/macsec.c +++ b/drivers/net/macsec.c @@ -2882,6 +2882,11 @@ static void macsec_dev_set_rx_mode(struct net_device *dev) dev_uc_sync(real_dev, dev); } +static sci_t dev_to_sci(struct net_device *dev, __be16 port) +{ + return make_sci(dev->dev_addr, port); +} + static int macsec_set_mac_address(struct net_device *dev, void *p) { struct macsec_dev *macsec = macsec_priv(dev); @@ -2903,6 +2908,7 @@ static int macsec_set_mac_address(struct net_device *dev, void *p) out: ether_addr_copy(dev->dev_addr, addr->sa_data); + macsec->secy.sci = dev_to_sci(dev, MACSEC_PORT_ES); return 0; } @@ -3176,11 +3182,6 @@ static bool sci_exists(struct net_device *dev, sci_t sci) return false; } -static sci_t dev_to_sci(struct net_device *dev, __be16 port) -{ - return make_sci(dev->dev_addr, port); -} - static int macsec_add_dev(struct net_device *dev, sci_t sci, u8 icv_len) { struct macsec_dev *macsec = macsec_priv(dev); |