* [PATCH] netpoll: don't send packets to detached device
@ 2006-10-18 20:50 Stephen Hemminger
2006-10-18 20:55 ` [PATCH] netpoll: netpoll_send_skb local optimization Stephen Hemminger
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Hemminger @ 2006-10-18 20:50 UTC (permalink / raw)
To: David S. Miller, Jeff Garzik; +Cc: Linus Torvalds, netdev
Netpoll shouldn't send packets to devices that have detached themselves.
This can happen during shutdown or suspend.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
--- a/net/core/netpoll.c 2006-10-18 13:41:49.000000000 -0700
+++ b/net/core/netpoll.c 2006-10-18 13:43:44.000000000 -0700
@@ -273,7 +273,7 @@
int status;
struct netpoll_info *npinfo;
- if (!np || !np->dev || !netif_running(np->dev)) {
+ if (!np || !np->dev || !netif_device_present(np->dev) || !netif_running(np->dev)) {
__kfree_skb(skb);
return;
}
^ permalink raw reply [flat|nested] 2+ messages in thread* [PATCH] netpoll: netpoll_send_skb local optimization
2006-10-18 20:50 [PATCH] netpoll: don't send packets to detached device Stephen Hemminger
@ 2006-10-18 20:55 ` Stephen Hemminger
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Hemminger @ 2006-10-18 20:55 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: David S. Miller, Jeff Garzik, Linus Torvalds, netdev
This cleans up netpoll_send_skb:
* np and np->dev are always non-null given the local callers
* get device into a local variable
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
--- orig/net/core/netpoll.c 2006-10-18 13:44:27.000000000 -0700
+++ new/net/core/netpoll.c 2006-10-18 13:46:03.000000000 -0700
@@ -270,19 +270,19 @@
static void netpoll_send_skb(struct netpoll *np, struct sk_buff *skb)
{
+ struct net_device *dev = np->dev;
+ struct netpoll_info *npinfo = dev->npinfo;
int status;
- struct netpoll_info *npinfo;
- if (!np || !np->dev || !netif_device_present(np->dev) || !netif_running(np->dev)) {
+ if (!netif_device_present(dev) || !netif_running(dev)) {
__kfree_skb(skb);
return;
}
- npinfo = np->dev->npinfo;
/* avoid recursion */
if (npinfo->poll_owner == smp_processor_id() ||
- np->dev->xmit_lock_owner == smp_processor_id()) {
+ dev->xmit_lock_owner == smp_processor_id()) {
if (np->drop)
np->drop(skb);
else
@@ -292,17 +292,17 @@
do {
npinfo->tries--;
- netif_tx_lock(np->dev);
+ netif_tx_lock(dev);
/*
* network drivers do not expect to be called if the queue is
* stopped.
*/
status = NETDEV_TX_BUSY;
- if (!netif_queue_stopped(np->dev))
- status = np->dev->hard_start_xmit(skb, np->dev);
+ if (!netif_queue_stopped(dev))
+ status = dev->hard_start_xmit(skb, dev);
- netif_tx_unlock(np->dev);
+ netif_tx_unlock(dev);
/* success */
if(!status) {
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2006-10-18 20:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-10-18 20:50 [PATCH] netpoll: don't send packets to detached device Stephen Hemminger
2006-10-18 20:55 ` [PATCH] netpoll: netpoll_send_skb local optimization Stephen Hemminger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).