Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2 files changed, 3 insertions, 1 deletions

diff --git a/include/net/ip.h b/include/net/ip.h
index d9a0e74d8923..fb63371c07a8 100644
--- a/include/net/ip.h
+++ b/include/net/ip.h
@@ -338,7 +338,7 @@ static inline int sk_mc_loop(struct sock *sk)
                 return inet6_sk(sk)->mc_loop;
 #endif
         }
-        __WARN();
+        WARN_ON(1);
         return 1;
 }
 
diff --git a/include/net/netrom.h b/include/net/netrom.h
index 15696b1fd30f..ab170a60e7d3 100644
--- a/include/net/netrom.h
+++ b/include/net/netrom.h
@@ -132,6 +132,8 @@ static __inline__ void nr_node_put(struct nr_node *nr_node)
 static __inline__ void nr_neigh_put(struct nr_neigh *nr_neigh)
 {
         if (atomic_dec_and_test(&nr_neigh->refcount)) {
+                if (nr_neigh->ax25)
+                        ax25_cb_put(nr_neigh->ax25);
                 kfree(nr_neigh->digipeat);
                 kfree(nr_neigh);
         }