Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

In netdevice.h we removed the structure in net-next that is being
changes in 'net'.  In macsec.c and rtnetlink.c we have overlaps
between fixes in 'net' and the u64 attribute changes in 'net-next'.

The mlx5 conflicts have to do with vxlan support dependencies.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 13 insertions, 10 deletions

diff --git a/drivers/net/macsec.c b/drivers/net/macsec.c
index 3add2c4aac21..460740ccc238 100644
--- a/drivers/net/macsec.c
+++ b/drivers/net/macsec.c
@@ -85,7 +85,7 @@ struct gcm_iv {
  * @tfm: crypto struct, key storage
  */
 struct macsec_key {
-        u64 id;
+        u8 id[MACSEC_KEYID_LEN];
         struct crypto_aead *tfm;
 };
 
@@ -1530,7 +1530,8 @@ static const struct nla_policy macsec_genl_sa_policy[NUM_MACSEC_SA_ATTR] = {
         [MACSEC_SA_ATTR_AN] = { .type = NLA_U8 },
         [MACSEC_SA_ATTR_ACTIVE] = { .type = NLA_U8 },
         [MACSEC_SA_ATTR_PN] = { .type = NLA_U32 },
-        [MACSEC_SA_ATTR_KEYID] = { .type = NLA_U64 },
+        [MACSEC_SA_ATTR_KEYID] = { .type = NLA_BINARY,
+                                   .len = MACSEC_KEYID_LEN, },
         [MACSEC_SA_ATTR_KEY] = { .type = NLA_BINARY,
                                  .len = MACSEC_MAX_KEY_LEN, },
 };
@@ -1577,6 +1578,9 @@ static bool validate_add_rxsa(struct nlattr **attrs)
                         return false;
         }
 
+        if (nla_len(attrs[MACSEC_SA_ATTR_KEYID]) != MACSEC_KEYID_LEN)
+                return false;
+
         return true;
 }
 
@@ -1642,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]);
 
-        rx_sa->key.id = nla_get_u64(tb_sa[MACSEC_SA_ATTR_KEYID]);
+        nla_memcpy(rx_sa->key.id, tb_sa[MACSEC_SA_ATTR_KEY], MACSEC_KEYID_LEN);
         rx_sa->sc = rx_sc;
         rcu_assign_pointer(rx_sc->sa[assoc_num], rx_sa);
 
@@ -1723,6 +1727,9 @@ static bool validate_add_txsa(struct nlattr **attrs)
                         return false;
         }
 
+        if (nla_len(attrs[MACSEC_SA_ATTR_KEYID]) != MACSEC_KEYID_LEN)
+                return false;
+
         return true;
 }
 
@@ -1778,7 +1785,7 @@ static int macsec_add_txsa(struct sk_buff *skb, struct genl_info *info)
                 return -ENOMEM;
         }
 
-        tx_sa->key.id = nla_get_u64(tb_sa[MACSEC_SA_ATTR_KEYID]);
+        nla_memcpy(tx_sa->key.id, tb_sa[MACSEC_SA_ATTR_KEY], MACSEC_KEYID_LEN);
 
         spin_lock_bh(&tx_sa->lock);
         tx_sa->next_pn = nla_get_u32(tb_sa[MACSEC_SA_ATTR_PN]);
@@ -2365,9 +2372,7 @@ static int dump_secy(struct macsec_secy *secy, struct net_device *dev,
 
                 if (nla_put_u8(skb, MACSEC_SA_ATTR_AN, i) ||
                     nla_put_u32(skb, MACSEC_SA_ATTR_PN, tx_sa->next_pn) ||
-                    nla_put_u64_64bit(skb, MACSEC_SA_ATTR_KEYID,
-                                      tx_sa->key.id,
-                                      MACSEC_SA_ATTR_PAD) ||
+                    nla_put(skb, MACSEC_SA_ATTR_KEYID, MACSEC_KEYID_LEN, tx_sa->key.id) ||
                     nla_put_u8(skb, MACSEC_SA_ATTR_ACTIVE, tx_sa->active)) {
                         nla_nest_cancel(skb, txsa_nest);
                         nla_nest_cancel(skb, txsa_list);
@@ -2469,9 +2474,7 @@ static int dump_secy(struct macsec_secy *secy, struct net_device *dev,
 
                         if (nla_put_u8(skb, MACSEC_SA_ATTR_AN, i) ||
                             nla_put_u32(skb, MACSEC_SA_ATTR_PN, rx_sa->next_pn) ||
-                            nla_put_u64_64bit(skb, MACSEC_SA_ATTR_KEYID,
-                                              rx_sa->key.id,
-                                              MACSEC_SA_ATTR_PAD) ||
+                            nla_put(skb, MACSEC_SA_ATTR_KEYID, MACSEC_KEYID_LEN, rx_sa->key.id) ||
                             nla_put_u8(skb, MACSEC_SA_ATTR_ACTIVE, rx_sa->active)) {
                                 nla_nest_cancel(skb, rxsa_nest);
                                 nla_nest_cancel(skb, rxsc_nest);