diff options
author | Figo.zhang <figo1802@gmail.com> | 2009-06-08 03:40:35 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-06-08 03:40:35 -0400 |
commit | 1d0ebfe7c9621d43804e9ce9f2b898541a7d9652 (patch) | |
tree | b13375888879581888bc4d773adcc55bf7d1e6ca | |
parent | a5b19b635c39fdb819500b0a746b44fe40c9a303 (diff) |
net pkgen.c:fix no need for check
vfree() does its own 'NULL' check, so no need for check before
calling it.
Signed-off-by: Figo.zhang <figo1802@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/core/pktgen.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/core/pktgen.c b/net/core/pktgen.c index b8ccd3c88d63..19b8c20e98a4 100644 --- a/net/core/pktgen.c +++ b/net/core/pktgen.c | |||
@@ -3691,8 +3691,7 @@ out1: | |||
3691 | #ifdef CONFIG_XFRM | 3691 | #ifdef CONFIG_XFRM |
3692 | free_SAs(pkt_dev); | 3692 | free_SAs(pkt_dev); |
3693 | #endif | 3693 | #endif |
3694 | if (pkt_dev->flows) | 3694 | vfree(pkt_dev->flows); |
3695 | vfree(pkt_dev->flows); | ||
3696 | kfree(pkt_dev); | 3695 | kfree(pkt_dev); |
3697 | return err; | 3696 | return err; |
3698 | } | 3697 | } |
@@ -3791,8 +3790,7 @@ static int pktgen_remove_device(struct pktgen_thread *t, | |||
3791 | #ifdef CONFIG_XFRM | 3790 | #ifdef CONFIG_XFRM |
3792 | free_SAs(pkt_dev); | 3791 | free_SAs(pkt_dev); |
3793 | #endif | 3792 | #endif |
3794 | if (pkt_dev->flows) | 3793 | vfree(pkt_dev->flows); |
3795 | vfree(pkt_dev->flows); | ||
3796 | kfree(pkt_dev); | 3794 | kfree(pkt_dev); |
3797 | return 0; | 3795 | return 0; |
3798 | } | 3796 | } |