aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/appletalk
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2009-12-03 02:58:21 -0500
committerDavid S. Miller <davem@davemloft.net>2009-12-03 16:18:01 -0500
commit8e95a2026f3b43f7c3d676adaccd2de9532e8dcc (patch)
tree3733318168cd512480b6db58c5c16d1c8847f0b7 /drivers/net/appletalk
parent3454f835837609d60b29a266e3bd9d701073b060 (diff)
drivers/net: Move && and || to end of previous line
Only files where David Miller is the primary git-signer. wireless, wimax, ixgbe, etc are not modified. Compile tested x86 allyesconfig only Not all files compiled (not x86 compatible) Added a few > 80 column lines, which I ignored. Existing checkpatch complaints ignored. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/appletalk')
-rw-r--r--drivers/net/appletalk/ipddp.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/appletalk/ipddp.c b/drivers/net/appletalk/ipddp.c
index aaf14d306a4..eb0448b03f4 100644
--- a/drivers/net/appletalk/ipddp.c
+++ b/drivers/net/appletalk/ipddp.c
@@ -230,9 +230,9 @@ static int ipddp_delete(struct ipddp_route *rt)
230 spin_lock_bh(&ipddp_route_lock); 230 spin_lock_bh(&ipddp_route_lock);
231 while((tmp = *r) != NULL) 231 while((tmp = *r) != NULL)
232 { 232 {
233 if(tmp->ip == rt->ip 233 if(tmp->ip == rt->ip &&
234 && tmp->at.s_net == rt->at.s_net 234 tmp->at.s_net == rt->at.s_net &&
235 && tmp->at.s_node == rt->at.s_node) 235 tmp->at.s_node == rt->at.s_node)
236 { 236 {
237 *r = tmp->next; 237 *r = tmp->next;
238 spin_unlock_bh(&ipddp_route_lock); 238 spin_unlock_bh(&ipddp_route_lock);
@@ -255,9 +255,9 @@ static struct ipddp_route* __ipddp_find_route(struct ipddp_route *rt)
255 255
256 for(f = ipddp_route_list; f != NULL; f = f->next) 256 for(f = ipddp_route_list; f != NULL; f = f->next)
257 { 257 {
258 if(f->ip == rt->ip 258 if(f->ip == rt->ip &&
259 && f->at.s_net == rt->at.s_net 259 f->at.s_net == rt->at.s_net &&
260 && f->at.s_node == rt->at.s_node) 260 f->at.s_node == rt->at.s_node)
261 return (f); 261 return (f);
262 } 262 }
263 263