net: macsec: allow multiple macsec devices with offload
authorDmitry Bogdanov <dbogdanov@marvell.com>
Wed, 25 Mar 2020 12:52:35 +0000 (15:52 +0300)
committerDavid S. Miller <davem@davemloft.net>
Fri, 27 Mar 2020 03:17:36 +0000 (20:17 -0700)
Offload engine can setup several SecY. Each macsec interface shall have
its own mac address. It will filter a traffic by dest mac address.

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>
drivers/net/macsec.c

index 093e81d605ec764e05ff30a1e2c79a072317b33b..146a7881a20ac61042fe5717ea8cbb16f3e3ce97 100644 (file)
@@ -2553,11 +2553,10 @@ static int macsec_upd_offload(struct sk_buff *skb, struct genl_info *info)
        enum macsec_offload offload, prev_offload;
        int (*func)(struct macsec_context *ctx);
        struct nlattr **attrs = info->attrs;
-       struct net_device *dev, *loop_dev;
+       struct net_device *dev;
        const struct macsec_ops *ops;
        struct macsec_context ctx;
        struct macsec_dev *macsec;
-       struct net *loop_net;
        int ret;
 
        if (!attrs[MACSEC_ATTR_IFINDEX])
@@ -2585,28 +2584,6 @@ static int macsec_upd_offload(struct sk_buff *skb, struct genl_info *info)
            !macsec_check_offload(offload, macsec))
                return -EOPNOTSUPP;
 
-       if (offload == MACSEC_OFFLOAD_OFF)
-               goto skip_limitation;
-
-       /* Check the physical interface isn't offloading another interface
-        * first.
-        */
-       for_each_net(loop_net) {
-               for_each_netdev(loop_net, loop_dev) {
-                       struct macsec_dev *priv;
-
-                       if (!netif_is_macsec(loop_dev))
-                               continue;
-
-                       priv = macsec_priv(loop_dev);
-
-                       if (priv->real_dev == macsec->real_dev &&
-                           priv->offload != MACSEC_OFFLOAD_OFF)
-                               return -EBUSY;
-               }
-       }
-
-skip_limitation:
        /* Check if the net device is busy. */
        if (netif_running(dev))
                return -EBUSY;