---

yaml --- r: 150746 b: refs/heads/master c: 1d0ebfe h: refs/heads/master v: v3
git-mirror · Jun 8, 2009 · 7ee04a9 · 7ee04a9
1 parent cee2074
commit 7ee04a9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git 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
@@ -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;
 }