aboutsummaryrefslogtreecommitdiffstats
path: root/net/appletalk
diff options
context:
space:
mode:
authorJulia Lawall <julia@diku.dk>2008-12-25 21:04:51 -0500
committerDavid S. Miller <davem@davemloft.net>2008-12-25 21:04:51 -0500
commit88a44e51e9a5202f8856f72400fc87a39205186d (patch)
tree05a7d480cf525d6d3a59d10c069544b2bd12e7fd /net/appletalk
parentc14ea0ca659d378dd377e417162ebd908d1da4ce (diff)
net/appletalk: Remove redundant test
atif is tested for being NULL twice, with the same effect in each case. I have kept the second test, as it seems to fit well with the comment above it. A simplified version of the semantic patch that makes this change is as follows: (http://www.emn.fr/x-info/coccinelle/) // <smpl> @r exists@ local idexpression x; expression E; position p1,p2; @@ if (x@p1 == NULL || ...) { ... when forall return ...; } ... when != \(x=E\|x--\|x++\|--x\|++x\|x-=E\|x+=E\|x|=E\|x&=E\|&x\) ( x@p2 == NULL | x@p2 != NULL ) // another path to the test that is not through p1? @s exists@ local idexpression r.x; position r.p1,r.p2; @@ ... when != x@p1 ( x@p2 == NULL | x@p2 != NULL ) @fix depends on !s@ position r.p1,r.p2; expression x,E; statement S1,S2; @@ ( - if ((x@p2 != NULL) || ...) S1 | - if ((x@p2 == NULL) && ...) S1 | - BUG_ON(x@p2 == NULL); ) // </smpl> Signed-off-by: Julia Lawall <julia@diku.dk> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/appletalk')
-rw-r--r--net/appletalk/ddp.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/net/appletalk/ddp.c b/net/appletalk/ddp.c
index c3f002717378..5abce07fb50a 100644
--- a/net/appletalk/ddp.c
+++ b/net/appletalk/ddp.c
@@ -815,9 +815,6 @@ static int atif_ioctl(int cmd, void __user *arg)
815 return -EPERM; 815 return -EPERM;
816 if (sa->sat_family != AF_APPLETALK) 816 if (sa->sat_family != AF_APPLETALK)
817 return -EINVAL; 817 return -EINVAL;
818 if (!atif)
819 return -EADDRNOTAVAIL;
820
821 /* 818 /*
822 * for now, we only support proxy AARP on ELAP; 819 * for now, we only support proxy AARP on ELAP;
823 * we should be able to do it for LocalTalk, too. 820 * we should be able to do it for LocalTalk, too.