--- zzzz-none-000/linux-2.6.28.10/include/net/neighbour.h	2009-05-02 18:54:43.000000000 +0000
+++ puma5-6360-529/linux-2.6.28.10/include/net/neighbour.h	2009-12-18 12:19:17.000000000 +0000
@@ -221,7 +221,7 @@
 extern void			neigh_parms_release(struct neigh_table *tbl, struct neigh_parms *parms);
 
 static inline
-struct net			*neigh_parms_net(const struct neigh_parms *parms)
+struct net			*neigh_parms_net(const struct neigh_parms *parms __attribute__ ((unused)))
 {
 #ifdef CONFIG_NET_NS
 	return parms->net;
@@ -247,6 +247,7 @@
 #ifdef CONFIG_NET_NS
 	return pneigh->net;
 #else
+    pneigh = pneigh;
 	return &init_net;
 #endif
 }