decnet: remove private wrappers of endian helpers

[linux-2.6-omap-h63xx.git] / net / decnet / dn_route.c

diff --git a/net/decnet/dn_route.c b/net/decnet/dn_route.c
index eeaa3d819f9c7be63f4348be585a42e67bdfc08d..b33b254c52cb67dbebb04b4b623c6f2e73931724 100644 (file)
--- a/net/decnet/dn_route.c
+++ b/net/decnet/dn_route.c
@@ -475,7 +475,7 @@ static int dn_route_rx_packet(struct sk_buff *skb)
                printk(KERN_DEBUG
                        "DECnet: dn_route_rx_packet: rt_flags=0x%02x dev=%s len=%d src=0x%04hx dst=0x%04hx err=%d type=%d\n",
                        (int)cb->rt_flags, devname, skb->len,
-                       dn_ntohs(cb->src), dn_ntohs(cb->dst),
+                       le16_to_cpu(cb->src), le16_to_cpu(cb->dst),
                        err, skb->pkt_type);
        }
 
@@ -575,7 +575,7 @@ int dn_route_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type
 {
        struct dn_skb_cb *cb;
        unsigned char flags = 0;
-       __u16 len = dn_ntohs(*(__le16 *)skb->data);
+       __u16 len = le16_to_cpu(*(__le16 *)skb->data);
        struct dn_dev *dn = (struct dn_dev *)dev->dn_ptr;
        unsigned char padlen = 0;
 
@@ -773,7 +773,7 @@ static int dn_rt_bug(struct sk_buff *skb)
                struct dn_skb_cb *cb = DN_SKB_CB(skb);
 
                printk(KERN_DEBUG "dn_rt_bug: skb from:%04x to:%04x\n",
-                               dn_ntohs(cb->src), dn_ntohs(cb->dst));
+                               le16_to_cpu(cb->src), le16_to_cpu(cb->dst));
        }
 
        kfree_skb(skb);
@@ -816,7 +816,7 @@ static int dn_rt_set_next_hop(struct dn_route *rt, struct dn_fib_res *res)
 
 static inline int dn_match_addr(__le16 addr1, __le16 addr2)
 {
-       __u16 tmp = dn_ntohs(addr1) ^ dn_ntohs(addr2);
+       __u16 tmp = le16_to_cpu(addr1) ^ le16_to_cpu(addr2);
        int match = 16;
        while(tmp) {
                tmp >>= 1;
@@ -886,8 +886,8 @@ static int dn_route_output_slow(struct dst_entry **pprt, const struct flowi *old
        if (decnet_debug_level & 16)
                printk(KERN_DEBUG
                       "dn_route_output_slow: dst=%04x src=%04x mark=%d"
-                      " iif=%d oif=%d\n", dn_ntohs(oldflp->fld_dst),
-                      dn_ntohs(oldflp->fld_src),
+                      " iif=%d oif=%d\n", le16_to_cpu(oldflp->fld_dst),
+                      le16_to_cpu(oldflp->fld_src),
                       oldflp->mark, init_net.loopback_dev->ifindex, oldflp->oif);
 
        /* If we have an output interface, verify its a DECnet device */
@@ -959,7 +959,7 @@ source_ok:
                printk(KERN_DEBUG
                       "dn_route_output_slow: initial checks complete."
                       " dst=%o4x src=%04x oif=%d try_hard=%d\n",
-                      dn_ntohs(fl.fld_dst), dn_ntohs(fl.fld_src),
+                      le16_to_cpu(fl.fld_dst), le16_to_cpu(fl.fld_src),
                       fl.oif, try_hard);
 
        /*
@@ -1711,8 +1711,8 @@ static int dn_rt_cache_seq_show(struct seq_file *seq, void *v)
 
        seq_printf(seq, "%-8s %-7s %-7s %04d %04d %04d\n",
                        rt->u.dst.dev ? rt->u.dst.dev->name : "*",
-                       dn_addr2asc(dn_ntohs(rt->rt_daddr), buf1),
-                       dn_addr2asc(dn_ntohs(rt->rt_saddr), buf2),
+                       dn_addr2asc(le16_to_cpu(rt->rt_daddr), buf1),
+                       dn_addr2asc(le16_to_cpu(rt->rt_saddr), buf2),
                        atomic_read(&rt->u.dst.__refcnt),
                        rt->u.dst.__use,
                        (int) dst_metric(&rt->u.dst, RTAX_RTT));