diff options
| author | Sabrina Dubroca <sd@queasysnail.net> | 2016-05-18 13:34:40 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-05-20 11:14:13 -0700 |
| commit | 1968a0b8b6ca088bc029bd99ee696f1aca4090d0 (patch) | |
| tree | 07547bdf1999a08e28fbd428fe04a234e8921e86 /drivers/net/macsec.c | |
| parent | f86911e2de129fb3c8ca402c251138d12c4a9d37 (diff) | |
| download | linux-rpi-1968a0b8b6ca088bc029bd99ee696f1aca4090d0.tar.gz linux-rpi-1968a0b8b6ca088bc029bd99ee696f1aca4090d0.tar.bz2 linux-rpi-1968a0b8b6ca088bc029bd99ee696f1aca4090d0.zip | |
macsec: fix netlink attribute for key id
In my last commit I replaced MACSEC_SA_ATTR_KEYID by
MACSEC_SA_ATTR_KEY.
Fixes: 8acca6acebd0 ("macsec: key identifier is 128 bits, not 64")
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/macsec.c')
| -rw-r--r-- | drivers/net/macsec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/macsec.c b/drivers/net/macsec.c index 460740ccc238..47ee2c840b55 100644 --- a/drivers/net/macsec.c +++ b/drivers/net/macsec.c @@ -1646,7 +1646,7 @@ static int macsec_add_rxsa(struct sk_buff *skb, struct genl_info *info) if (tb_sa[MACSEC_SA_ATTR_ACTIVE]) rx_sa->active = !!nla_get_u8(tb_sa[MACSEC_SA_ATTR_ACTIVE]); - nla_memcpy(rx_sa->key.id, tb_sa[MACSEC_SA_ATTR_KEY], MACSEC_KEYID_LEN); + nla_memcpy(rx_sa->key.id, tb_sa[MACSEC_SA_ATTR_KEYID], MACSEC_KEYID_LEN); rx_sa->sc = rx_sc; rcu_assign_pointer(rx_sc->sa[assoc_num], rx_sa); @@ -1785,7 +1785,7 @@ static int macsec_add_txsa(struct sk_buff *skb, struct genl_info *info) return -ENOMEM; } - nla_memcpy(tx_sa->key.id, tb_sa[MACSEC_SA_ATTR_KEY], MACSEC_KEYID_LEN); + nla_memcpy(tx_sa->key.id, tb_sa[MACSEC_SA_ATTR_KEYID], MACSEC_KEYID_LEN); spin_lock_bh(&tx_sa->lock); tx_sa->next_pn = nla_get_u32(tb_sa[MACSEC_SA_ATTR_PN]); |