3 files changed, 10 insertions, 21 deletions

diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c
index 8e37e71e34ff..1b683f302657 100644
--- a/net/ax25/af_ax25.c
+++ b/net/ax25/af_ax25.c
@@ -1138,10 +1138,8 @@ static int ax25_connect(struct socket *sock, struct sockaddr *uaddr,
         sk->sk_state   = TCP_CLOSE;
         sock->state = SS_UNCONNECTED;
 
-        if (ax25->digipeat != NULL) {
-                kfree(ax25->digipeat);
-                ax25->digipeat = NULL;
-        }
+        kfree(ax25->digipeat);
+        ax25->digipeat = NULL;
 
         /*
          *      Handle digi-peaters to be used.
diff --git a/net/ax25/ax25_in.c b/net/ax25/ax25_in.c
index 73cfc3411c46..4cf87540fb3a 100644
--- a/net/ax25/ax25_in.c
+++ b/net/ax25/ax25_in.c
@@ -401,10 +401,8 @@ static int ax25_rcv(struct sk_buff *skb, struct net_device *dev,
         }
 
         if (dp.ndigi == 0) {
-                if (ax25->digipeat != NULL) {
-                        kfree(ax25->digipeat);
-                        ax25->digipeat = NULL;
-                }
+                kfree(ax25->digipeat);
+                ax25->digipeat = NULL;
         } else {
                 /* Reverse the source SABM's path */
                 memcpy(ax25->digipeat, &reverse_dp, sizeof(ax25_digi));
diff --git a/net/ax25/ax25_route.c b/net/ax25/ax25_route.c
index 26b77d972220..b1e945bd6ed3 100644
--- a/net/ax25/ax25_route.c
+++ b/net/ax25/ax25_route.c
@@ -54,15 +54,13 @@ void ax25_rt_device_down(struct net_device *dev)
                 if (s->dev == dev) {
                         if (ax25_route_list == s) {
                                 ax25_route_list = s->next;
-                                if (s->digipeat != NULL)
-                                        kfree(s->digipeat);
+                                kfree(s->digipeat);
                                 kfree(s);
                         } else {
                                 for (t = ax25_route_list; t != NULL; t = t->next) {
                                         if (t->next == s) {
                                                 t->next = s->next;
-                                                if (s->digipeat != NULL)
-                                                        kfree(s->digipeat);
+                                                kfree(s->digipeat);
                                                 kfree(s);
                                                 break;
                                         }
@@ -90,10 +88,8 @@ static int ax25_rt_add(struct ax25_routes_struct *route)
         while (ax25_rt != NULL) {
                 if (ax25cmp(&ax25_rt->callsign, &route->dest_addr) == 0 &&
                             ax25_rt->dev == ax25_dev->dev) {
-                        if (ax25_rt->digipeat != NULL) {
-                                kfree(ax25_rt->digipeat);
-                                ax25_rt->digipeat = NULL;
-                        }
+                        kfree(ax25_rt->digipeat);
+                        ax25_rt->digipeat = NULL;
                         if (route->digi_count != 0) {
                                 if ((ax25_rt->digipeat = kmalloc(sizeof(ax25_digi), GFP_ATOMIC)) == NULL) {
                                         write_unlock(&ax25_route_lock);
@@ -145,8 +141,7 @@ static int ax25_rt_add(struct ax25_routes_struct *route)
 static void ax25_rt_destroy(ax25_route *ax25_rt)
 {
         if (atomic_read(&ax25_rt->ref) == 0) {
-                if (ax25_rt->digipeat != NULL)
-                        kfree(ax25_rt->digipeat);
+                kfree(ax25_rt->digipeat);
                 kfree(ax25_rt);
                 return;
         }
@@ -530,9 +525,7 @@ void __exit ax25_rt_free(void)
                 s       = ax25_rt;
                 ax25_rt = ax25_rt->next;
 
-                if (s->digipeat != NULL)
-                        kfree(s->digipeat);
-
+                kfree(s->digipeat);
                 kfree(s);
         }
         write_unlock(&ax25_route_lock);