.entries = ATOMIC_INIT(0),
};
-static __inline__ unsigned dn_hash(__le16 src, __le16 dst)
+static __inline__ unsigned dn_hash(unsigned short src, unsigned short dst)
{
- __u16 tmp = (__u16 __force)(src ^ dst);
+ unsigned short tmp = src ^ dst;
tmp ^= (tmp >> 3);
tmp ^= (tmp >> 5);
tmp ^= (tmp >> 10);
static inline void dnrt_drop(struct dn_route *rt)
{
- dst_release(&rt->u.dst);
+ if (rt)
+ dst_release(&rt->u.dst);
call_rcu_bh(&rt->u.dst.rcu_head, dst_rcu_free);
}
{
struct dn_skb_cb *cb;
unsigned char *ptr;
- __le16 *src;
- __le16 *dst;
- __le16 tmp;
+ dn_address *src;
+ dn_address *dst;
+ dn_address tmp;
/* Add back headers */
skb_push(skb, skb->data - skb->nh.raw);
ptr = skb->data + 2;
*ptr++ = (cb->rt_flags & ~DN_RT_F_RQR) | DN_RT_F_RTS;
- dst = (__le16 *)ptr;
+ dst = (dn_address *)ptr;
ptr += 2;
- src = (__le16 *)ptr;
+ src = (dn_address *)ptr;
ptr += 2;
*ptr = 0; /* Zero hop count */
struct dn_skb_cb *cb = DN_SKB_CB(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),
+ (int)cb->rt_flags, devname, skb->len, cb->src, cb->dst,
err, skb->pkt_type);
}
/* Destination info */
ptr += 2;
- cb->dst = dn_eth2dn(ptr);
+ cb->dst = dn_htons(dn_eth2dn(ptr));
if (memcmp(ptr, dn_hiord_addr, 4) != 0)
goto drop_it;
ptr += 6;
/* Source info */
ptr += 2;
- cb->src = dn_eth2dn(ptr);
+ cb->src = dn_htons(dn_eth2dn(ptr));
if (memcmp(ptr, dn_hiord_addr, 4) != 0)
goto drop_it;
ptr += 6;
skb_pull(skb, 5);
skb->h.raw = skb->data;
- cb->dst = *(__le16 *)ptr;
+ cb->dst = *(dn_address *)ptr;
ptr += 2;
- cb->src = *(__le16 *)ptr;
+ cb->src = *(dn_address *)ptr;
ptr += 2;
cb->hops = *ptr & 0x3f;
{
struct dn_skb_cb *cb;
unsigned char flags = 0;
- __u16 len = dn_ntohs(*(__le16 *)skb->data);
+ __u16 len = dn_ntohs(*(__u16 *)skb->data);
struct dn_dev *dn = (struct dn_dev *)dev->dn_ptr;
unsigned char padlen = 0;
padlen);
if (flags & DN_RT_PKT_CNTL) {
- if (unlikely(skb_linearize(skb)))
+ if (unlikely(skb_is_nonlinear(skb)) &&
+ skb_linearize(skb, GFP_ATOMIC) != 0)
goto dump_it;
switch(flags & DN_RT_CNTL_MSK) {
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));
+ cb->src, cb->dst);
}
kfree_skb(skb);
return 0;
}
-static inline int dn_match_addr(__le16 addr1, __le16 addr2)
+static inline int dn_match_addr(__u16 addr1, __u16 addr2)
{
__u16 tmp = dn_ntohs(addr1) ^ dn_ntohs(addr2);
int match = 16;
return match;
}
-static __le16 dnet_select_source(const struct net_device *dev, __le16 daddr, int scope)
+static __u16 dnet_select_source(const struct net_device *dev, __u16 daddr, int scope)
{
- __le16 saddr = 0;
+ __u16 saddr = 0;
struct dn_dev *dn_db = dev->dn_ptr;
struct dn_ifaddr *ifa;
int best_match = 0;
return saddr;
}
-static inline __le16 __dn_fib_res_prefsrc(struct dn_fib_res *res)
+static inline __u16 __dn_fib_res_prefsrc(struct dn_fib_res *res)
{
return dnet_select_source(DN_FIB_RES_DEV(*res), DN_FIB_RES_GW(*res), res->scope);
}
-static inline __le16 dn_fib_rules_map_destination(__le16 daddr, struct dn_fib_res *res)
+static inline __u16 dn_fib_rules_map_destination(__u16 daddr, struct dn_fib_res *res)
{
- __le16 mask = dnet_make_mask(res->prefixlen);
+ __u16 mask = dnet_make_mask(res->prefixlen);
return (daddr&~mask)|res->fi->fib_nh->nh_gw;
}
struct dn_fib_res res = { .fi = NULL, .type = RTN_UNICAST };
int err;
int free_res = 0;
- __le16 gateway = 0;
+ __u16 gateway = 0;
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", oldflp->fld_dst, oldflp->fld_src,
oldflp->fld_fwmark, loopback_dev.ifindex, oldflp->oif);
/* If we have an output interface, verify its a DECnet device */
if (decnet_debug_level & 16)
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),
- fl.oif, try_hard);
+ " dst=%o4x src=%04x oif=%d try_hard=%d\n", fl.fld_dst,
+ fl.fld_src, fl.oif, try_hard);
/*
* N.B. If the kernel is compiled without router support then
struct neighbour *neigh = NULL;
unsigned hash;
int flags = 0;
- __le16 gateway = 0;
- __le16 local_src = 0;
+ __u16 gateway = 0;
+ __u16 local_src = 0;
struct flowi fl = { .nl_u = { .dn_u =
{ .daddr = cb->dst,
.saddr = cb->src,
res.type = RTN_LOCAL;
flags |= RTCF_DIRECTSRC;
} else {
- __le16 src_map = fl.fld_src;
+ __u16 src_map = fl.fld_src;
free_res = 1;
out_dev = DN_FIB_RES_DEV(res);