git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
net
/
decnet
/
dn_table.c
diff --git
a/net/decnet/dn_table.c
b/net/decnet/dn_table.c
index
0ebc46a
..
6f8b565
100644
(file)
--- a/
net/decnet/dn_table.c
+++ b/
net/decnet/dn_table.c
@@
-46,7
+46,7
@@
struct dn_zone
u32 dz_hashmask;
#define DZ_HASHMASK(dz) ((dz)->dz_hashmask)
int dz_order;
u32 dz_hashmask;
#define DZ_HASHMASK(dz) ((dz)->dz_hashmask)
int dz_order;
-
__le16
dz_mask;
+
u16
dz_mask;
#define DZ_MASK(dz) ((dz)->dz_mask)
};
#define DZ_MASK(dz) ((dz)->dz_mask)
};
@@
-84,14
+84,14
@@
static int dn_fib_hash_zombies;
static inline dn_fib_idx_t dn_hash(dn_fib_key_t key, struct dn_zone *dz)
{
static inline dn_fib_idx_t dn_hash(dn_fib_key_t key, struct dn_zone *dz)
{
- u16 h =
dn_
ntohs(key.datum)>>(16 - dz->dz_order);
+ u16 h = ntohs(key.datum)>>(16 - dz->dz_order);
h ^= (h >> 10);
h ^= (h >> 6);
h &= DZ_HASHMASK(dz);
return *(dn_fib_idx_t *)&h;
}
h ^= (h >> 10);
h ^= (h >> 6);
h &= DZ_HASHMASK(dz);
return *(dn_fib_idx_t *)&h;
}
-static inline dn_fib_key_t dz_key(
__le
16 dst, struct dn_zone *dz)
+static inline dn_fib_key_t dz_key(
u
16 dst, struct dn_zone *dz)
{
dn_fib_key_t k;
k.datum = dst & DZ_MASK(dz);
{
dn_fib_key_t k;
k.datum = dst & DZ_MASK(dz);
@@
-250,7
+250,7
@@
static int dn_fib_nh_match(struct rtmsg *r, struct nlmsghdr *nlh, struct dn_kern
for_nexthops(fi) {
int attrlen = nhlen - sizeof(struct rtnexthop);
for_nexthops(fi) {
int attrlen = nhlen - sizeof(struct rtnexthop);
-
__le16
gw;
+
dn_address
gw;
if (attrlen < 0 || (nhlen -= nhp->rtnh_len) < 0)
return -EINVAL;
if (attrlen < 0 || (nhlen -= nhp->rtnh_len) < 0)
return -EINVAL;
@@
-457,7
+457,7
@@
static int dn_fib_table_insert(struct dn_fib_table *tb, struct rtmsg *r, struct
dz_key_0(key);
if (rta->rta_dst) {
dz_key_0(key);
if (rta->rta_dst) {
-
__le16
dst;
+
dn_address
dst;
memcpy(&dst, rta->rta_dst, 2);
if (dst & ~DZ_MASK(dz))
return -EINVAL;
memcpy(&dst, rta->rta_dst, 2);
if (dst & ~DZ_MASK(dz))
return -EINVAL;
@@
-593,7
+593,7
@@
static int dn_fib_table_delete(struct dn_fib_table *tb, struct rtmsg *r, struct
dz_key_0(key);
if (rta->rta_dst) {
dz_key_0(key);
if (rta->rta_dst) {
-
__le16
dst;
+
dn_address
dst;
memcpy(&dst, rta->rta_dst, 2);
if (dst & ~DZ_MASK(dz))
return -EINVAL;
memcpy(&dst, rta->rta_dst, 2);
if (dst & ~DZ_MASK(dz))
return -EINVAL;