Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5de4a473 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller
Browse files

netpoll queue cleanup 



The beast had a long and not very happy history. At one
point, a friend (netdump) had asked that he open up a little.
Well, the friend was long gone now, and the beast had
this dangling piece hanging (netpoll_queue).

It wasn't hard to stitch the netpoll_queue back in
where it belonged and make everything tidy.

Signed-off-by: default avatarStephen Hemminger <shemminger@osdl.org>
parent 2bdfe0ba

drivers/net/netconsole.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -60,7 +60,6 @@ static struct netpoll np = { 
	.local_port = 6665,

	.local_port = 6665,

	.remote_port = 6666,

	.remote_port = 6666,

	.remote_mac = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff},

	.remote_mac = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff},

	.drop = netpoll_queue,

};

};

static int configured = 0;

static int configured = 0;

include/linux/netpoll.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -18,7 +18,7 @@ struct netpoll { 
	struct net_device *dev;

	struct net_device *dev;

	char dev_name[16], *name;

	char dev_name[16], *name;

	void (*rx_hook)(struct netpoll *, int, char *, int);

	void (*rx_hook)(struct netpoll *, int, char *, int);

	void (*drop)(struct sk_buff *skb);



	u32 local_ip, remote_ip;

	u32 local_ip, remote_ip;

	u16 local_port, remote_port;

	u16 local_port, remote_port;

	unsigned char local_mac[6], remote_mac[6];

	unsigned char local_mac[6], remote_mac[6];
@@ -44,7 +44,7 @@ int netpoll_trap(void); 
void netpoll_set_trap(int trap);

void netpoll_set_trap(int trap);

void netpoll_cleanup(struct netpoll *np);

void netpoll_cleanup(struct netpoll *np);

int __netpoll_rx(struct sk_buff *skb);

int __netpoll_rx(struct sk_buff *skb);

void netpoll_queue(struct sk_buff *skb);







#ifdef CONFIG_NETPOLL

#ifdef CONFIG_NETPOLL

static inline int netpoll_rx(struct sk_buff *skb)

static inline int netpoll_rx(struct sk_buff *skb)

net/core/netpoll.c

+3 −20
Original line number Original line Diff line number Diff line
@@ -77,19 +77,6 @@ static void queue_process(void *p) 
	}

	}

}

}





void netpoll_queue(struct sk_buff *skb)

{

	struct net_device *dev = skb->dev;

	struct netpoll_info *npinfo = dev->npinfo;



	if (!npinfo)

		kfree_skb(skb);

	else {

		skb_queue_tail(&npinfo->txq, skb);

		schedule_work(&npinfo->tx_work);

	}

}



static int checksum_udp(struct sk_buff *skb, struct udphdr *uh,

static int checksum_udp(struct sk_buff *skb, struct udphdr *uh,

			     unsigned short ulen, u32 saddr, u32 daddr)

			     unsigned short ulen, u32 saddr, u32 daddr)

{

{
@@ -256,7 +243,7 @@ static void netpoll_send_skb(struct netpoll *np, struct sk_buff *skb) 
 	}

 	}





	/* don't get messages out of order, and no recursion */

	/* don't get messages out of order, and no recursion */

	if ( !(np->drop == netpoll_queue && skb_queue_len(&npinfo->txq))

	if ( skb_queue_len(&npinfo->txq) == 0

	     && npinfo->poll_owner != smp_processor_id()

	     && npinfo->poll_owner != smp_processor_id()

	     && netif_tx_trylock(dev)) {

	     && netif_tx_trylock(dev)) {
@@ -277,11 +264,8 @@ static void netpoll_send_skb(struct netpoll *np, struct sk_buff *skb) 
	}

	}





	if (status != NETDEV_TX_OK) {

	if (status != NETDEV_TX_OK) {

		/* requeue for later */

		skb_queue_tail(&npinfo->txq, skb);

		if (np->drop)

		schedule_work(&npinfo->tx_work);

			np->drop(skb);

		else

			__kfree_skb(skb);

	}

	}

}

}
@@ -809,4 +793,3 @@ EXPORT_SYMBOL(netpoll_setup); 
EXPORT_SYMBOL(netpoll_cleanup);

EXPORT_SYMBOL(netpoll_cleanup);

EXPORT_SYMBOL(netpoll_send_udp);

EXPORT_SYMBOL(netpoll_send_udp);

EXPORT_SYMBOL(netpoll_poll);
 
EXPORT_SYMBOL(netpoll_poll);
 
EXPORT_SYMBOL(netpoll_queue);