aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/802/fddi.c4
-rw-r--r--net/802/hippi.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/net/802/fddi.c b/net/802/fddi.c
index ace6386384bc..8c86216b1c85 100644
--- a/net/802/fddi.c
+++ b/net/802/fddi.c
@@ -100,7 +100,7 @@ static int fddi_rebuild_header(struct sk_buff *skb)
100 struct fddihdr *fddi = (struct fddihdr *)skb->data; 100 struct fddihdr *fddi = (struct fddihdr *)skb->data;
101 101
102#ifdef CONFIG_INET 102#ifdef CONFIG_INET
103 if (fddi->hdr.llc_snap.ethertype == __constant_htons(ETH_P_IP)) 103 if (fddi->hdr.llc_snap.ethertype == htons(ETH_P_IP))
104 /* Try to get ARP to resolve the header and fill destination address */ 104 /* Try to get ARP to resolve the header and fill destination address */
105 return arp_find(fddi->daddr, skb); 105 return arp_find(fddi->daddr, skb);
106 else 106 else
@@ -135,7 +135,7 @@ __be16 fddi_type_trans(struct sk_buff *skb, struct net_device *dev)
135 if(fddi->hdr.llc_8022_1.dsap==0xe0) 135 if(fddi->hdr.llc_8022_1.dsap==0xe0)
136 { 136 {
137 skb_pull(skb, FDDI_K_8022_HLEN-3); 137 skb_pull(skb, FDDI_K_8022_HLEN-3);
138 type = __constant_htons(ETH_P_802_2); 138 type = htons(ETH_P_802_2);
139 } 139 }
140 else 140 else
141 { 141 {
diff --git a/net/802/hippi.c b/net/802/hippi.c
index 578f2a3d692d..35dd938cff95 100644
--- a/net/802/hippi.c
+++ b/net/802/hippi.c
@@ -60,7 +60,7 @@ static int hippi_header(struct sk_buff *skb, struct net_device *dev,
60 * Due to the stupidity of the little endian byte-order we 60 * Due to the stupidity of the little endian byte-order we
61 * have to set the fp field this way. 61 * have to set the fp field this way.
62 */ 62 */
63 hip->fp.fixed = __constant_htonl(0x04800018); 63 hip->fp.fixed = htonl(0x04800018);
64 hip->fp.d2_size = htonl(len + 8); 64 hip->fp.d2_size = htonl(len + 8);
65 hip->le.fc = 0; 65 hip->le.fc = 0;
66 hip->le.double_wide = 0; /* only HIPPI 800 for the time being */ 66 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)
104 * Only IP is currently supported 104 * Only IP is currently supported
105 */ 105 */
106 106
107 if(hip->snap.ethertype != __constant_htons(ETH_P_IP)) 107 if(hip->snap.ethertype != htons(ETH_P_IP))
108 { 108 {
109 printk(KERN_DEBUG "%s: unable to resolve type %X addresses.\n",skb->dev->name,ntohs(hip->snap.ethertype)); 109 printk(KERN_DEBUG "%s: unable to resolve type %X addresses.\n",skb->dev->name,ntohs(hip->snap.ethertype));
110 return 0; 110 return 0;