[NET] 802: Use hton{s,l}() where appropriate.
authorYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Mon, 26 Mar 2007 03:11:55 +0000 (20:11 -0700)
committerDavid S. Miller <davem@sunset.davemloft.net>
Thu, 26 Apr 2007 05:23:52 +0000 (22:23 -0700)
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/802/fddi.c
net/802/hippi.c

index ace6386384bcee286cb7646cb86d078e65015868..8c86216b1c8506137ec84e10c405d0f6b1539fa3 100644 (file)
@@ -100,7 +100,7 @@ static int fddi_rebuild_header(struct sk_buff       *skb)
        struct fddihdr *fddi = (struct fddihdr *)skb->data;
 
 #ifdef CONFIG_INET
-       if (fddi->hdr.llc_snap.ethertype == __constant_htons(ETH_P_IP))
+       if (fddi->hdr.llc_snap.ethertype == htons(ETH_P_IP))
                /* Try to get ARP to resolve the header and fill destination address */
                return arp_find(fddi->daddr, skb);
        else
@@ -135,7 +135,7 @@ __be16 fddi_type_trans(struct sk_buff *skb, struct net_device *dev)
        if(fddi->hdr.llc_8022_1.dsap==0xe0)
        {
                skb_pull(skb, FDDI_K_8022_HLEN-3);
-               type = __constant_htons(ETH_P_802_2);
+               type = htons(ETH_P_802_2);
        }
        else
        {
index 578f2a3d692d2019a22b56105cef81c56ab10c4f..35dd938cff95133b2bcf9076e2e553fb8eb50d4c 100644 (file)
@@ -60,7 +60,7 @@ static int hippi_header(struct sk_buff *skb, struct net_device *dev,
         * Due to the stupidity of the little endian byte-order we
         * have to set the fp field this way.
         */
-       hip->fp.fixed           = __constant_htonl(0x04800018);
+       hip->fp.fixed           = htonl(0x04800018);
        hip->fp.d2_size         = htonl(len + 8);
        hip->le.fc              = 0;
        hip->le.double_wide     = 0;    /* only HIPPI 800 for the time being */
@@ -104,7 +104,7 @@ static int hippi_rebuild_header(struct sk_buff *skb)
         * Only IP is currently supported
         */
 
-       if(hip->snap.ethertype != __constant_htons(ETH_P_IP))
+       if(hip->snap.ethertype != htons(ETH_P_IP))
        {
                printk(KERN_DEBUG "%s: unable to resolve type %X addresses.\n",skb->dev->name,ntohs(hip->snap.ethertype));
                return 0;