diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2007-04-21 01:47:35 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-26 01:25:10 -0400 |
commit | eddc9ec53be2ecdbf4efe0efd4a83052594f0ac0 (patch) | |
tree | 4a38ab4dbd9d61fdf5a5ea6ed61463e0b9e33ba7 /net/sched/sch_dsmark.c | |
parent | e023dd643798c4f06c16466af90b4d250e4b8bd7 (diff) |
[SK_BUFF]: Introduce ip_hdr(), remove skb->nh.iph
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/sch_dsmark.c')
-rw-r--r-- | net/sched/sch_dsmark.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sched/sch_dsmark.c b/net/sched/sch_dsmark.c index 96324cf4e6a9..45b5734dd72a 100644 --- a/net/sched/sch_dsmark.c +++ b/net/sched/sch_dsmark.c | |||
@@ -216,7 +216,7 @@ static int dsmark_enqueue(struct sk_buff *skb,struct Qdisc *sch) | |||
216 | /* FIXME: Safe with non-linear skbs? --RR */ | 216 | /* FIXME: Safe with non-linear skbs? --RR */ |
217 | switch (skb->protocol) { | 217 | switch (skb->protocol) { |
218 | case __constant_htons(ETH_P_IP): | 218 | case __constant_htons(ETH_P_IP): |
219 | skb->tc_index = ipv4_get_dsfield(skb->nh.iph) | 219 | skb->tc_index = ipv4_get_dsfield(ip_hdr(skb)) |
220 | & ~INET_ECN_MASK; | 220 | & ~INET_ECN_MASK; |
221 | break; | 221 | break; |
222 | case __constant_htons(ETH_P_IPV6): | 222 | case __constant_htons(ETH_P_IPV6): |
@@ -292,7 +292,7 @@ static struct sk_buff *dsmark_dequeue(struct Qdisc *sch) | |||
292 | 292 | ||
293 | switch (skb->protocol) { | 293 | switch (skb->protocol) { |
294 | case __constant_htons(ETH_P_IP): | 294 | case __constant_htons(ETH_P_IP): |
295 | ipv4_change_dsfield(skb->nh.iph, p->mask[index], | 295 | ipv4_change_dsfield(ip_hdr(skb), p->mask[index], |
296 | p->value[index]); | 296 | p->value[index]); |
297 | break; | 297 | break; |
298 | case __constant_htons(ETH_P_IPV6): | 298 | case __constant_htons(ETH_P_IPV6): |