diff options
author | Pavel Emelyanov <xemul@openvz.org> | 2007-10-21 19:57:55 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-22 05:59:55 -0400 |
commit | dfa4091129019959f4608756f76dc687495287ad (patch) | |
tree | 33d8b8a961bcff6b2d8f942d7c24e38210294684 /net/core | |
parent | 7131c6c73656b92aea806c6e688e97aa49ff911e (diff) |
[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>
Diffstat (limited to 'net/core')
-rw-r--r-- | net/core/dev.c | 2 | ||||
-rw-r--r-- | net/core/pktgen.c | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 38b03da5c1ca..1672cc134853 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
@@ -1661,7 +1661,7 @@ gso: | |||
1661 | q = dev->qdisc; | 1661 | q = dev->qdisc; |
1662 | if (q->enqueue) { | 1662 | if (q->enqueue) { |
1663 | /* reset queue_mapping to zero */ | 1663 | /* reset queue_mapping to zero */ |
1664 | skb->queue_mapping = 0; | 1664 | skb_set_queue_mapping(skb, 0); |
1665 | rc = q->enqueue(skb, q); | 1665 | rc = q->enqueue(skb, q); |
1666 | qdisc_run(dev); | 1666 | qdisc_run(dev); |
1667 | spin_unlock(&dev->queue_lock); | 1667 | spin_unlock(&dev->queue_lock); |
diff --git a/net/core/pktgen.c b/net/core/pktgen.c index c4719edb55c0..b78235e5a7f4 100644 --- a/net/core/pktgen.c +++ b/net/core/pktgen.c | |||
@@ -2603,8 +2603,7 @@ static struct sk_buff *fill_packet_ipv4(struct net_device *odev, | |||
2603 | skb->network_header = skb->tail; | 2603 | skb->network_header = skb->tail; |
2604 | skb->transport_header = skb->network_header + sizeof(struct iphdr); | 2604 | skb->transport_header = skb->network_header + sizeof(struct iphdr); |
2605 | skb_put(skb, sizeof(struct iphdr) + sizeof(struct udphdr)); | 2605 | skb_put(skb, sizeof(struct iphdr) + sizeof(struct udphdr)); |
2606 | skb->queue_mapping = pkt_dev->cur_queue_map; | 2606 | skb_set_queue_mapping(skb, pkt_dev->cur_queue_map); |
2607 | |||
2608 | iph = ip_hdr(skb); | 2607 | iph = ip_hdr(skb); |
2609 | udph = udp_hdr(skb); | 2608 | udph = udp_hdr(skb); |
2610 | 2609 | ||
@@ -2941,8 +2940,7 @@ static struct sk_buff *fill_packet_ipv6(struct net_device *odev, | |||
2941 | skb->network_header = skb->tail; | 2940 | skb->network_header = skb->tail; |
2942 | skb->transport_header = skb->network_header + sizeof(struct ipv6hdr); | 2941 | skb->transport_header = skb->network_header + sizeof(struct ipv6hdr); |
2943 | skb_put(skb, sizeof(struct ipv6hdr) + sizeof(struct udphdr)); | 2942 | skb_put(skb, sizeof(struct ipv6hdr) + sizeof(struct udphdr)); |
2944 | skb->queue_mapping = pkt_dev->cur_queue_map; | 2943 | skb_set_queue_mapping(skb, pkt_dev->cur_queue_map); |
2945 | |||
2946 | iph = ipv6_hdr(skb); | 2944 | iph = ipv6_hdr(skb); |
2947 | udph = udp_hdr(skb); | 2945 | udph = udp_hdr(skb); |
2948 | 2946 | ||