diff options
| author | Patrick McHardy <kaber@trash.net> | 2009-06-11 10:00:49 -0400 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2009-06-11 10:00:49 -0400 |
| commit | 36432dae73cf2c90a59b39c8df9fd8219272b005 (patch) | |
| tree | 660b9104305a809ec4fdeb295ca13d6e90790ecc /net/core/pktgen.c | |
| parent | 440f0d588555892601cfe511728a0fc0c8204063 (diff) | |
| parent | bb400801c2f40bbd9a688818323ad09abfc4e581 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
Diffstat (limited to 'net/core/pktgen.c')
| -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 b8ccd3c88d6..19b8c20e98a 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 | } |