Skip to content

Commit

Permalink
pktgen: stop_device cleanup
Browse files Browse the repository at this point in the history
All the callers were freeing skb after stopping device.
Remove unneeded forward decl.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Stephen Hemminger authored and David S. Miller committed Aug 29, 2009
1 parent 65c5b78 commit 3bda06a
Showing 1 changed file with 3 additions and 9 deletions.
12 changes: 3 additions & 9 deletions net/core/pktgen.c
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ static int pktgen_device_event(struct notifier_block *, unsigned long, void *);
static void pktgen_run_all_threads(void);
static void pktgen_reset_all_threads(void);
static void pktgen_stop_all_threads_ifs(void);
static int pktgen_stop_device(struct pktgen_dev *pkt_dev);

static void pktgen_stop(struct pktgen_thread *t);
static void pktgen_clear_counters(struct pktgen_dev *pkt_dev);

Expand Down Expand Up @@ -3221,7 +3221,6 @@ static void show_results(struct pktgen_dev *pkt_dev, int nr_frags)
}

/* Set stopped-at timer, remove from running list, do counters & statistics */

static int pktgen_stop_device(struct pktgen_dev *pkt_dev)
{
int nr_frags = pkt_dev->skb ? skb_shinfo(pkt_dev->skb)->nr_frags : -1;
Expand All @@ -3232,6 +3231,8 @@ static int pktgen_stop_device(struct pktgen_dev *pkt_dev)
return -EINVAL;
}

kfree_skb(pkt_dev->skb);
pkt_dev->skb = NULL;
pkt_dev->stopped_at = getCurUs();
pkt_dev->running = 0;

Expand Down Expand Up @@ -3268,9 +3269,6 @@ static void pktgen_stop(struct pktgen_thread *t)

list_for_each_entry(pkt_dev, &t->if_list, list) {
pktgen_stop_device(pkt_dev);
kfree_skb(pkt_dev->skb);

pkt_dev->skb = NULL;
}

if_unlock(t);
Expand Down Expand Up @@ -3382,8 +3380,6 @@ static void pktgen_xmit(struct pktgen_dev *pkt_dev)

if (!netif_running(odev)) {
pktgen_stop_device(pkt_dev);
kfree_skb(pkt_dev->skb);
pkt_dev->skb = NULL;
goto out;
}
if (need_resched())
Expand Down Expand Up @@ -3486,8 +3482,6 @@ static void pktgen_xmit(struct pktgen_dev *pkt_dev)

/* Done with this */
pktgen_stop_device(pkt_dev);
kfree_skb(pkt_dev->skb);
pkt_dev->skb = NULL;
}
out:;
}
Expand Down

0 comments on commit 3bda06a

Please sign in to comment.