diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
commit | 1ebbe2b20091d306453a5cf480a87e6cd28ae76f (patch) | |
tree | f5cd7a0fa69b8b1938cb5a0faed2e7b0628072a5 /net/decnet/dn_fib.c | |
parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) |
Merge branch 'linus'
Diffstat (limited to 'net/decnet/dn_fib.c')
-rw-r--r-- | net/decnet/dn_fib.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/decnet/dn_fib.c b/net/decnet/dn_fib.c index 99bc061759c3..bd4ce8681a12 100644 --- a/net/decnet/dn_fib.c +++ b/net/decnet/dn_fib.c | |||
@@ -143,11 +143,11 @@ static inline struct dn_fib_info *dn_fib_find_info(const struct dn_fib_info *nfi | |||
143 | return NULL; | 143 | return NULL; |
144 | } | 144 | } |
145 | 145 | ||
146 | u16 dn_fib_get_attr16(struct rtattr *attr, int attrlen, int type) | 146 | __le16 dn_fib_get_attr16(struct rtattr *attr, int attrlen, int type) |
147 | { | 147 | { |
148 | while(RTA_OK(attr,attrlen)) { | 148 | while(RTA_OK(attr,attrlen)) { |
149 | if (attr->rta_type == type) | 149 | if (attr->rta_type == type) |
150 | return *(u16*)RTA_DATA(attr); | 150 | return *(__le16*)RTA_DATA(attr); |
151 | attr = RTA_NEXT(attr, attrlen); | 151 | attr = RTA_NEXT(attr, attrlen); |
152 | } | 152 | } |
153 | 153 | ||
@@ -565,7 +565,7 @@ int dn_fib_dump(struct sk_buff *skb, struct netlink_callback *cb) | |||
565 | return skb->len; | 565 | return skb->len; |
566 | } | 566 | } |
567 | 567 | ||
568 | static void fib_magic(int cmd, int type, __u16 dst, int dst_len, struct dn_ifaddr *ifa) | 568 | static void fib_magic(int cmd, int type, __le16 dst, int dst_len, struct dn_ifaddr *ifa) |
569 | { | 569 | { |
570 | struct dn_fib_table *tb; | 570 | struct dn_fib_table *tb; |
571 | struct { | 571 | struct { |
@@ -684,7 +684,7 @@ static int dn_fib_dnaddr_event(struct notifier_block *this, unsigned long event, | |||
684 | return NOTIFY_DONE; | 684 | return NOTIFY_DONE; |
685 | } | 685 | } |
686 | 686 | ||
687 | int dn_fib_sync_down(dn_address local, struct net_device *dev, int force) | 687 | int dn_fib_sync_down(__le16 local, struct net_device *dev, int force) |
688 | { | 688 | { |
689 | int ret = 0; | 689 | int ret = 0; |
690 | int scope = RT_SCOPE_NOWHERE; | 690 | int scope = RT_SCOPE_NOWHERE; |