iwlwifi: remove support for fw older than -17 and -22

[cascardo/linux.git] / drivers / net / macsec.c

diff --git a/drivers/net/macsec.c b/drivers/net/macsec.c
index 2043e8c..3ea47f2 100644 (file)
--- a/drivers/net/macsec.c
+++ b/drivers/net/macsec.c
@@ -2973,6 +2973,7 @@ static void macsec_setup(struct net_device *dev)
        dev->priv_flags |= IFF_NO_QUEUE;
        dev->netdev_ops = &macsec_netdev_ops;
        dev->destructor = macsec_free_netdev;
+       SET_NETDEV_DEVTYPE(dev, &macsec_type);
 
        eth_zero_addr(dev->broadcast);
 }
@@ -3201,7 +3202,7 @@ static int macsec_newlink(struct net *net, struct net_device *dev,
 
        dev_hold(real_dev);
 
-       macsec->nest_level = dev_get_nest_level(real_dev, netif_is_macsec) + 1;
+       macsec->nest_level = dev_get_nest_level(real_dev) + 1;
        netdev_lockdep_set_classes(dev);
        lockdep_set_class_and_subclass(&dev->addr_list_lock,
                                       &macsec_netdev_addr_lock_key,