diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-29 02:03:42 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-29 02:03:42 -0400 |
| commit | 3dcbbcda7c5b77c400791b26facd6593c5b176e0 (patch) | |
| tree | 2e7b844c4d450cf43810a6ed0ddd5c702c245a88 /include/net/ip_mp_alg.h | |
| parent | c972398b7871d9fb58c6a317786065a7cc6ca4be (diff) | |
| parent | 6fbe59b9569b2c8d5522d182263935c6c86fc40a (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (160 commits)
[ETHTOOL]: Remove some entries from non-root command list.
[Bluetooth]: Fix section mismatch of bt_sysfs_cleanup()
[Bluetooth]: Don't update disconnect timer for incoming connections
[ETHTOOL]: let mortals use ethtool
[NetLabel]: add audit support for configuration changes
[TCP]: Fix and simplify microsecond rtt sampling
[TCP] tcp-lp: prevent chance for oops
[SUNRPC]: Remove unnecessary check in net/sunrpc/svcsock.c
[IPVS] bug: endianness breakage in ip_vs_ftp
[IPVS]: ipvs annotations
[NETFILTER]: h323 annotations
[NETFILTER]: ipt annotations
[NETFILTER]: NAT annotations
[NETFILTER]: conntrack annotations
[NETFILTER]: netfilter misc annotations
[NET]: Annotate dst_ops protocol
[NET]: is it Andy or Andi ??
[IPVS]: Make sure ip_vs_ftp ports are valid: module_param_array approach
[IPVS]: Reverse valid ip_vs_ftp ports fix: port check approach
[IrDA] stir4200: removing undocumented bits handling
...
Diffstat (limited to 'include/net/ip_mp_alg.h')
| -rw-r--r-- | include/net/ip_mp_alg.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/ip_mp_alg.h b/include/net/ip_mp_alg.h index ac747b64734c..beffdd66ad74 100644 --- a/include/net/ip_mp_alg.h +++ b/include/net/ip_mp_alg.h | |||
| @@ -17,7 +17,7 @@ struct ip_mp_alg_ops { | |||
| 17 | void (*mp_alg_select_route)(const struct flowi *flp, | 17 | void (*mp_alg_select_route)(const struct flowi *flp, |
| 18 | struct rtable *rth, struct rtable **rp); | 18 | struct rtable *rth, struct rtable **rp); |
| 19 | void (*mp_alg_flush)(void); | 19 | void (*mp_alg_flush)(void); |
| 20 | void (*mp_alg_set_nhinfo)(__u32 network, __u32 netmask, | 20 | void (*mp_alg_set_nhinfo)(__be32 network, __be32 netmask, |
| 21 | unsigned char prefixlen, | 21 | unsigned char prefixlen, |
| 22 | const struct fib_nh *nh); | 22 | const struct fib_nh *nh); |
| 23 | void (*mp_alg_remove)(struct rtable *rth); | 23 | void (*mp_alg_remove)(struct rtable *rth); |
| @@ -59,7 +59,7 @@ static inline void multipath_flush(void) | |||
| 59 | } | 59 | } |
| 60 | 60 | ||
| 61 | static inline void multipath_set_nhinfo(struct rtable *rth, | 61 | static inline void multipath_set_nhinfo(struct rtable *rth, |
| 62 | __u32 network, __u32 netmask, | 62 | __be32 network, __be32 netmask, |
| 63 | unsigned char prefixlen, | 63 | unsigned char prefixlen, |
| 64 | const struct fib_nh *nh) | 64 | const struct fib_nh *nh) |
| 65 | { | 65 | { |