[NET] SCHED: Use htons() where appropriate.
authorYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Wed, 7 Mar 2007 05:21:20 +0000 (14:21 +0900)
committerDavid S. Miller <davem@sunset.davemloft.net>
Thu, 26 Apr 2007 05:24:00 +0000 (22:24 -0700)
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/sched/cls_rsvp.h
net/sched/sch_api.c

index 7853621a04cc03d5c68fa1f6d0064c5f6586c88f..b6ac0e287872485060f9098d82fe028e59ad1cb6 100644 (file)
@@ -160,7 +160,7 @@ restart:
        dst = &nhptr->daddr;
        protocol = nhptr->protocol;
        xprt = ((u8*)nhptr) + (nhptr->ihl<<2);
-       if (nhptr->frag_off&__constant_htons(IP_MF|IP_OFFSET))
+       if (nhptr->frag_off & htons(IP_MF|IP_OFFSET))
                return -1;
 #endif
 
index ecc988af4a9a8e798b5dd439b9ce3c008a8f97e9..4a927a5e1fa62bcda787c579eb21f546d64bbe54 100644 (file)
@@ -1146,7 +1146,7 @@ reclassify:
 
        for ( ; tp; tp = tp->next) {
                if ((tp->protocol == protocol ||
-                       tp->protocol == __constant_htons(ETH_P_ALL)) &&
+                       tp->protocol == htons(ETH_P_ALL)) &&
                        (err = tp->classify(skb, tp, res)) >= 0) {
 #ifdef CONFIG_NET_CLS_ACT
                        if ( TC_ACT_RECLASSIFY == err) {