Bluetooth: Cancel the Sniff timer

[platform/kernel/linux-starfive.git] / drivers / net / macsec.c

diff --git a/drivers/net/macsec.c b/drivers/net/macsec.c
index b7e1514..9663050 100644 (file)
--- a/drivers/net/macsec.c
+++ b/drivers/net/macsec.c
@@ -2383,6 +2383,7 @@ static int macsec_upd_txsa(struct sk_buff *skb, struct genl_info *info)
 
                ctx.sa.assoc_num = assoc_num;
                ctx.sa.tx_sa = tx_sa;
+               ctx.sa.update_pn = !!prev_pn.full64;
                ctx.secy = secy;
 
                ret = macsec_offload(ops->mdo_upd_txsa, &ctx);
@@ -2476,6 +2477,7 @@ static int macsec_upd_rxsa(struct sk_buff *skb, struct genl_info *info)
 
                ctx.sa.assoc_num = assoc_num;
                ctx.sa.rx_sa = rx_sa;
+               ctx.sa.update_pn = !!prev_pn.full64;
                ctx.secy = secy;
 
                ret = macsec_offload(ops->mdo_upd_rxsa, &ctx);
@@ -3655,9 +3657,9 @@ static void macsec_get_stats64(struct net_device *dev,
 
        dev_fetch_sw_netstats(s, dev->tstats);
 
-       s->rx_dropped = atomic_long_read(&dev->stats.__rx_dropped);
-       s->tx_dropped = atomic_long_read(&dev->stats.__tx_dropped);
-       s->rx_errors = atomic_long_read(&dev->stats.__rx_errors);
+       s->rx_dropped = DEV_STATS_READ(dev, rx_dropped);
+       s->tx_dropped = DEV_STATS_READ(dev, tx_dropped);
+       s->rx_errors = DEV_STATS_READ(dev, rx_errors);
 }
 
 static int macsec_get_iflink(const struct net_device *dev)