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

Commit dfa40911 authored Oct 21, 2007 by Pavel Emelyanov Committed by David S. Miller Oct 22, 2007

[NET]: Use the skb_set_queue_mapping where appropriate



There's already such a helper to initialize this field.  Use it.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 7131c6c7

net/core/dev.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1661,7 +1661,7 @@ int dev_queue_xmit(struct sk_buff *skb)
	q = dev->qdisc;		q = dev->qdisc;
	if (q->enqueue) {		if (q->enqueue) {
	/* reset queue_mapping to zero */		/* reset queue_mapping to zero */
	skb->queue_mapping = 0;		skb_set_queue_mapping(skb, 0);
	rc = q->enqueue(skb, q);		rc = q->enqueue(skb, q);
	qdisc_run(dev);		qdisc_run(dev);
	spin_unlock(&dev->queue_lock);		spin_unlock(&dev->queue_lock);

net/core/pktgen.c

+2 −4

Original line number	Original line	Diff line number	Diff line
	@@ -2603,8 +2603,7 @@ static struct sk_buff fill_packet_ipv4(struct net_device odev,
	skb->network_header = skb->tail;		skb->network_header = skb->tail;
	skb->transport_header = skb->network_header + sizeof(struct iphdr);		skb->transport_header = skb->network_header + sizeof(struct iphdr);
	skb_put(skb, sizeof(struct iphdr) + sizeof(struct udphdr));		skb_put(skb, sizeof(struct iphdr) + sizeof(struct udphdr));
	skb->queue_mapping = pkt_dev->cur_queue_map;		skb_set_queue_mapping(skb, pkt_dev->cur_queue_map);

	iph = ip_hdr(skb);		iph = ip_hdr(skb);
	udph = udp_hdr(skb);		udph = udp_hdr(skb);

	@@ -2941,8 +2940,7 @@ static struct sk_buff fill_packet_ipv6(struct net_device odev,
	skb->network_header = skb->tail;		skb->network_header = skb->tail;
	skb->transport_header = skb->network_header + sizeof(struct ipv6hdr);		skb->transport_header = skb->network_header + sizeof(struct ipv6hdr);
	skb_put(skb, sizeof(struct ipv6hdr) + sizeof(struct udphdr));		skb_put(skb, sizeof(struct ipv6hdr) + sizeof(struct udphdr));
	skb->queue_mapping = pkt_dev->cur_queue_map;		skb_set_queue_mapping(skb, pkt_dev->cur_queue_map);

	iph = ipv6_hdr(skb);		iph = ipv6_hdr(skb);
	udph = udp_hdr(skb);		udph = udp_hdr(skb);