|
@@ -188,7 +188,7 @@ struct macsec_tx_sa {
|
|
struct macsec_key key;
|
|
struct macsec_key key;
|
|
spinlock_t lock;
|
|
spinlock_t lock;
|
|
u32 next_pn;
|
|
u32 next_pn;
|
|
- atomic_t refcnt;
|
|
|
|
|
|
+ refcount_t refcnt;
|
|
bool active;
|
|
bool active;
|
|
struct macsec_tx_sa_stats __percpu *stats;
|
|
struct macsec_tx_sa_stats __percpu *stats;
|
|
struct rcu_head rcu;
|
|
struct rcu_head rcu;
|
|
@@ -362,7 +362,7 @@ static struct macsec_tx_sa *macsec_txsa_get(struct macsec_tx_sa __rcu *ptr)
|
|
if (!sa || !sa->active)
|
|
if (!sa || !sa->active)
|
|
return NULL;
|
|
return NULL;
|
|
|
|
|
|
- if (!atomic_inc_not_zero(&sa->refcnt))
|
|
|
|
|
|
+ if (!refcount_inc_not_zero(&sa->refcnt))
|
|
return NULL;
|
|
return NULL;
|
|
|
|
|
|
return sa;
|
|
return sa;
|
|
@@ -379,7 +379,7 @@ static void free_txsa(struct rcu_head *head)
|
|
|
|
|
|
static void macsec_txsa_put(struct macsec_tx_sa *sa)
|
|
static void macsec_txsa_put(struct macsec_tx_sa *sa)
|
|
{
|
|
{
|
|
- if (atomic_dec_and_test(&sa->refcnt))
|
|
|
|
|
|
+ if (refcount_dec_and_test(&sa->refcnt))
|
|
call_rcu(&sa->rcu, free_txsa);
|
|
call_rcu(&sa->rcu, free_txsa);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1437,7 +1437,7 @@ static int init_tx_sa(struct macsec_tx_sa *tx_sa, char *sak, int key_len,
|
|
}
|
|
}
|
|
|
|
|
|
tx_sa->active = false;
|
|
tx_sa->active = false;
|
|
- atomic_set(&tx_sa->refcnt, 1);
|
|
|
|
|
|
+ refcount_set(&tx_sa->refcnt, 1);
|
|
spin_lock_init(&tx_sa->lock);
|
|
spin_lock_init(&tx_sa->lock);
|
|
|
|
|
|
return 0;
|
|
return 0;
|