Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 7 insertions, 6 deletions

diff --git a/drivers/net/appletalk/ipddp.c b/drivers/net/appletalk/ipddp.c
index aaf14d306a4a..79636ee35829 100644
--- a/drivers/net/appletalk/ipddp.c
+++ b/drivers/net/appletalk/ipddp.c
@@ -31,6 +31,7 @@
 #include <linux/ip.h>
 #include <linux/atalk.h>
 #include <linux/if_arp.h>
+#include <linux/slab.h>
 #include <net/route.h>
 #include <asm/uaccess.h>
 
@@ -230,9 +231,9 @@ static int ipddp_delete(struct ipddp_route *rt)
         spin_lock_bh(&ipddp_route_lock);
         while((tmp = *r) != NULL)
         {
-                if(tmp->ip == rt->ip
-                        && tmp->at.s_net == rt->at.s_net
-                        && tmp->at.s_node == rt->at.s_node)
+                if(tmp->ip == rt->ip &&
+                   tmp->at.s_net == rt->at.s_net &&
+                   tmp->at.s_node == rt->at.s_node)
                 {
                         *r = tmp->next;
                         spin_unlock_bh(&ipddp_route_lock);
@@ -255,9 +256,9 @@ static struct ipddp_route* __ipddp_find_route(struct ipddp_route *rt)
 
         for(f = ipddp_route_list; f != NULL; f = f->next)
         {
-                if(f->ip == rt->ip
-                        && f->at.s_net == rt->at.s_net
-                        && f->at.s_node == rt->at.s_node)
+                if(f->ip == rt->ip &&
+                   f->at.s_net == rt->at.s_net &&
+                   f->at.s_node == rt->at.s_node)
                         return (f);
         }