From 662e27d0401a4e960d35bc9775ee5028a9e496c5 Mon Sep 17 00:00:00 2001 From: Pavel Emelyanov Date: Sun, 21 Oct 2007 16:57:55 -0700 Subject: [PATCH] --- yaml --- r: 72101 b: refs/heads/master c: dfa4091129019959f4608756f76dc687495287ad h: refs/heads/master i: 72099: bce06004442197c979e03d2a2b4aced56bf8345a v: v3 --- [refs] | 2 +- trunk/net/core/dev.c | 2 +- trunk/net/core/pktgen.c | 6 ++---- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index f4d0e6e8e6a9..c5f860d27b5f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7131c6c73656b92aea806c6e688e97aa49ff911e +refs/heads/master: dfa4091129019959f4608756f76dc687495287ad diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c index 38b03da5c1ca..1672cc134853 100644 --- a/trunk/net/core/dev.c +++ b/trunk/net/core/dev.c @@ -1661,7 +1661,7 @@ int dev_queue_xmit(struct sk_buff *skb) q = dev->qdisc; if (q->enqueue) { /* reset queue_mapping to zero */ - skb->queue_mapping = 0; + skb_set_queue_mapping(skb, 0); rc = q->enqueue(skb, q); qdisc_run(dev); spin_unlock(&dev->queue_lock); diff --git a/trunk/net/core/pktgen.c b/trunk/net/core/pktgen.c index c4719edb55c0..b78235e5a7f4 100644 --- a/trunk/net/core/pktgen.c +++ b/trunk/net/core/pktgen.c @@ -2603,8 +2603,7 @@ static struct sk_buff *fill_packet_ipv4(struct net_device *odev, skb->network_header = skb->tail; skb->transport_header = skb->network_header + sizeof(struct iphdr); 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); 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->transport_header = skb->network_header + sizeof(struct ipv6hdr); 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); udph = udp_hdr(skb);