From 7ee04a933e4d9edc082f6ce95d7878756b1f8dcc Mon Sep 17 00:00:00 2001 From: "Figo.zhang" Date: Mon, 8 Jun 2009 00:40:35 -0700 Subject: [PATCH] --- yaml --- r: 150746 b: refs/heads/master c: 1d0ebfe7c9621d43804e9ce9f2b898541a7d9652 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/core/pktgen.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index e6b6f016c316..5ac849d4414c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a5b19b635c39fdb819500b0a746b44fe40c9a303 +refs/heads/master: 1d0ebfe7c9621d43804e9ce9f2b898541a7d9652 diff --git a/trunk/net/core/pktgen.c b/trunk/net/core/pktgen.c index b8ccd3c88d63..19b8c20e98a4 100644 --- a/trunk/net/core/pktgen.c +++ b/trunk/net/core/pktgen.c @@ -3691,8 +3691,7 @@ static int pktgen_add_device(struct pktgen_thread *t, const char *ifname) #ifdef CONFIG_XFRM free_SAs(pkt_dev); #endif - if (pkt_dev->flows) - vfree(pkt_dev->flows); + vfree(pkt_dev->flows); kfree(pkt_dev); return err; } @@ -3791,8 +3790,7 @@ static int pktgen_remove_device(struct pktgen_thread *t, #ifdef CONFIG_XFRM free_SAs(pkt_dev); #endif - if (pkt_dev->flows) - vfree(pkt_dev->flows); + vfree(pkt_dev->flows); kfree(pkt_dev); return 0; }