From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Hemminger Subject: Re: [PATCH 1/2] pktgen: check for link down Date: Mon, 21 Sep 2009 22:55:43 -0700 Message-ID: <20090921225543.44d2d5c4@nehalam> References: <20090919221844.114e2e23@nehalam> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: David Miller , Robert Olsson , Jesper Dangaard Brouer , netdev@vger.kernel.org To: Stephen Hemminger Return-path: Received: from mail.vyatta.com ([76.74.103.46]:35488 "EHLO mail.vyatta.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755149AbZIVFzs (ORCPT ); Tue, 22 Sep 2009 01:55:48 -0400 In-Reply-To: <20090919221844.114e2e23@nehalam> Sender: netdev-owner@vger.kernel.org List-ID: On Sat, 19 Sep 2009 22:18:44 -0700 Stephen Hemminger wrote: > If cable is pulled, pktgen shouldn't continue slamming packets into the > device. > > Signed-off-by: Stephen Hemminger > > --- a/net/core/pktgen.c 2009-09-19 11:20:55.546463176 -0700 > +++ b/net/core/pktgen.c 2009-09-19 11:22:44.810509240 -0700 > @@ -1959,7 +1959,7 @@ static int pktgen_setup_dev(struct pktge > if (odev->type != ARPHRD_ETHER) { > printk(KERN_ERR "pktgen: not an ethernet device: \"%s\"\n", ifname); > err = -EINVAL; > - } else if (!netif_running(odev)) { > + } else if (!netif_running(odev) || !netif_carrier_ok(odev)) { > printk(KERN_ERR "pktgen: device is down: \"%s\"\n", ifname); > err = -ENETDOWN; > } else { > @@ -3410,7 +3410,7 @@ static void pktgen_xmit(struct pktgen_de > /* Did we saturate the queue already? */ > if (netif_tx_queue_stopped(txq) || netif_tx_queue_frozen(txq)) { > /* If device is down, then all queues are permnantly frozen */ > - if (netif_running(odev)) > + if (netif_running(odev) && netif_carrier_ok(odev)) > idle(pkt_dev); > else > pktgen_stop_device(pkt_dev); You can hold off on these two patches, I have better version which fixes some other issues. But testing time is limited this week.