diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2008-09-21 01:20:49 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-09-21 01:20:49 -0400 |
commit | 6067804047b64dde89f4f133fc7eba48ee44107d (patch) | |
tree | abe87787c3ad2aee82e576c7d4128e29bb296ac0 /net/sched/sch_dsmark.c | |
parent | a574420ff46cff0245e6b0fce2e961aa2717743d (diff) |
net: Use hton[sl]() instead of __constant_hton[sl]() where applicable
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 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/sched/sch_dsmark.c b/net/sched/sch_dsmark.c index edd1298f85f6..ba43aab3a851 100644 --- a/net/sched/sch_dsmark.c +++ b/net/sched/sch_dsmark.c | |||
@@ -202,7 +202,7 @@ static int dsmark_enqueue(struct sk_buff *skb, struct Qdisc *sch) | |||
202 | 202 | ||
203 | if (p->set_tc_index) { | 203 | if (p->set_tc_index) { |
204 | switch (skb->protocol) { | 204 | switch (skb->protocol) { |
205 | case __constant_htons(ETH_P_IP): | 205 | case htons(ETH_P_IP): |
206 | if (skb_cow_head(skb, sizeof(struct iphdr))) | 206 | if (skb_cow_head(skb, sizeof(struct iphdr))) |
207 | goto drop; | 207 | goto drop; |
208 | 208 | ||
@@ -210,7 +210,7 @@ static int dsmark_enqueue(struct sk_buff *skb, struct Qdisc *sch) | |||
210 | & ~INET_ECN_MASK; | 210 | & ~INET_ECN_MASK; |
211 | break; | 211 | break; |
212 | 212 | ||
213 | case __constant_htons(ETH_P_IPV6): | 213 | case htons(ETH_P_IPV6): |
214 | if (skb_cow_head(skb, sizeof(struct ipv6hdr))) | 214 | if (skb_cow_head(skb, sizeof(struct ipv6hdr))) |
215 | goto drop; | 215 | goto drop; |
216 | 216 | ||
@@ -289,11 +289,11 @@ static struct sk_buff *dsmark_dequeue(struct Qdisc *sch) | |||
289 | pr_debug("index %d->%d\n", skb->tc_index, index); | 289 | pr_debug("index %d->%d\n", skb->tc_index, index); |
290 | 290 | ||
291 | switch (skb->protocol) { | 291 | switch (skb->protocol) { |
292 | case __constant_htons(ETH_P_IP): | 292 | case htons(ETH_P_IP): |
293 | ipv4_change_dsfield(ip_hdr(skb), p->mask[index], | 293 | ipv4_change_dsfield(ip_hdr(skb), p->mask[index], |
294 | p->value[index]); | 294 | p->value[index]); |
295 | break; | 295 | break; |
296 | case __constant_htons(ETH_P_IPV6): | 296 | case htons(ETH_P_IPV6): |
297 | ipv6_change_dsfield(ipv6_hdr(skb), p->mask[index], | 297 | ipv6_change_dsfield(ipv6_hdr(skb), p->mask[index], |
298 | p->value[index]); | 298 | p->value[index]); |
299 | break; | 299 | break; |