aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/net/ax25.h6
-rw-r--r--net/ax25/ax25_route.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/include/net/ax25.h b/include/net/ax25.h
index edd82f0a4d27..e3467ba81f6e 100644
--- a/include/net/ax25.h
+++ b/include/net/ax25.h
@@ -185,7 +185,7 @@ typedef struct {
185 185
186typedef struct ax25_route { 186typedef struct ax25_route {
187 struct ax25_route *next; 187 struct ax25_route *next;
188 atomic_t refcount; 188 refcount_t refcount;
189 ax25_address callsign; 189 ax25_address callsign;
190 struct net_device *dev; 190 struct net_device *dev;
191 ax25_digi *digipeat; 191 ax25_digi *digipeat;
@@ -194,14 +194,14 @@ typedef struct ax25_route {
194 194
195static inline void ax25_hold_route(ax25_route *ax25_rt) 195static inline void ax25_hold_route(ax25_route *ax25_rt)
196{ 196{
197 atomic_inc(&ax25_rt->refcount); 197 refcount_inc(&ax25_rt->refcount);
198} 198}
199 199
200void __ax25_put_route(ax25_route *ax25_rt); 200void __ax25_put_route(ax25_route *ax25_rt);
201 201
202static inline void ax25_put_route(ax25_route *ax25_rt) 202static inline void ax25_put_route(ax25_route *ax25_rt)
203{ 203{
204 if (atomic_dec_and_test(&ax25_rt->refcount)) 204 if (refcount_dec_and_test(&ax25_rt->refcount))
205 __ax25_put_route(ax25_rt); 205 __ax25_put_route(ax25_rt);
206} 206}
207 207
diff --git a/net/ax25/ax25_route.c b/net/ax25/ax25_route.c
index e1fda27cb27c..0446b892618a 100644
--- a/net/ax25/ax25_route.c
+++ b/net/ax25/ax25_route.c
@@ -114,7 +114,7 @@ static int __must_check ax25_rt_add(struct ax25_routes_struct *route)
114 return -ENOMEM; 114 return -ENOMEM;
115 } 115 }
116 116
117 atomic_set(&ax25_rt->refcount, 1); 117 refcount_set(&ax25_rt->refcount, 1);
118 ax25_rt->callsign = route->dest_addr; 118 ax25_rt->callsign = route->dest_addr;
119 ax25_rt->dev = ax25_dev->dev; 119 ax25_rt->dev = ax25_dev->dev;
120 ax25_rt->digipeat = NULL; 120 ax25_rt->digipeat = NULL;