|
@@ -16,6 +16,7 @@
|
|
|
#include <crypto/aead.h>
|
|
|
#include <linux/etherdevice.h>
|
|
|
#include <linux/rtnetlink.h>
|
|
|
+#include <linux/refcount.h>
|
|
|
#include <net/genetlink.h>
|
|
|
#include <net/sock.h>
|
|
|
#include <net/gro_cells.h>
|
|
@@ -146,7 +147,7 @@ struct macsec_rx_sa {
|
|
|
struct macsec_key key;
|
|
|
spinlock_t lock;
|
|
|
u32 next_pn;
|
|
|
- atomic_t refcnt;
|
|
|
+ refcount_t refcnt;
|
|
|
bool active;
|
|
|
struct macsec_rx_sa_stats __percpu *stats;
|
|
|
struct macsec_rx_sc *sc;
|
|
@@ -314,7 +315,7 @@ static struct macsec_rx_sa *macsec_rxsa_get(struct macsec_rx_sa __rcu *ptr)
|
|
|
if (!sa || !sa->active)
|
|
|
return NULL;
|
|
|
|
|
|
- if (!atomic_inc_not_zero(&sa->refcnt))
|
|
|
+ if (!refcount_inc_not_zero(&sa->refcnt))
|
|
|
return NULL;
|
|
|
|
|
|
return sa;
|
|
@@ -350,7 +351,7 @@ static void free_rxsa(struct rcu_head *head)
|
|
|
|
|
|
static void macsec_rxsa_put(struct macsec_rx_sa *sa)
|
|
|
{
|
|
|
- if (atomic_dec_and_test(&sa->refcnt))
|
|
|
+ if (refcount_dec_and_test(&sa->refcnt))
|
|
|
call_rcu(&sa->rcu, free_rxsa);
|
|
|
}
|
|
|
|
|
@@ -1339,7 +1340,7 @@ static int init_rx_sa(struct macsec_rx_sa *rx_sa, char *sak, int key_len,
|
|
|
|
|
|
rx_sa->active = false;
|
|
|
rx_sa->next_pn = 1;
|
|
|
- atomic_set(&rx_sa->refcnt, 1);
|
|
|
+ refcount_set(&rx_sa->refcnt, 1);
|
|
|
spin_lock_init(&rx_sa->lock);
|
|
|
|
|
|
return 0;
|