Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

[linux-2.6-omap-h63xx.git] / include / net / ax25.h

diff --git a/include/net/ax25.h b/include/net/ax25.h
index 30bb4a893237ff8926a0c3f0cb79591ba96a072a..2250a18b0cbb5fe2cb88a51dd5c2f0ca3af70cd2 100644 (file)
--- a/include/net/ax25.h
+++ b/include/net/ax25.h
@@ -237,8 +237,7 @@ typedef struct ax25_cb {
 static __inline__ void ax25_cb_put(ax25_cb *ax25)
 {
        if (atomic_dec_and_test(&ax25->refcount)) {
-               if (ax25->digipeat)
-                       kfree(ax25->digipeat);
+               kfree(ax25->digipeat);
                kfree(ax25);
        }
 }