diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-17 19:30:31 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-17 19:30:31 -0400 |
| commit | cb46c3701fb7b738de1e22ac4f2d06d18f547a74 (patch) | |
| tree | 7d8740ed7849d31eaea19e696a4ea098ba151a96 /net/ipx/ipx_route.c | |
| parent | 9676489866a75fdd56b0d3e40ec7884298bb1338 (diff) | |
| parent | 8872d8e1c4311dd7e5086975df9c76120a0be83b (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:
[TCP]: reno sacked_out count fix
[IPV6]: Endian fix in net/ipv6/netfilter/ip6t_eui64.c:match().
[TR]: Remove an unused export.
[IPX]: Correct return type of ipx_map_frame_type().
[IPX]: Correct argument type of ipxrtr_delete().
[PKT_SCHED]: Potential jiffy wrap bug in dev_watchdog().
Diffstat (limited to 'net/ipx/ipx_route.c')
| -rw-r--r-- | net/ipx/ipx_route.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipx/ipx_route.c b/net/ipx/ipx_route.c index 67774448efd9..a394c6fe19a2 100644 --- a/net/ipx/ipx_route.c +++ b/net/ipx/ipx_route.c | |||
| @@ -119,7 +119,7 @@ out: | |||
| 119 | return rc; | 119 | return rc; |
| 120 | } | 120 | } |
| 121 | 121 | ||
| 122 | static int ipxrtr_delete(long net) | 122 | static int ipxrtr_delete(__u32 net) |
| 123 | { | 123 | { |
| 124 | struct ipx_route *r, *tmp; | 124 | struct ipx_route *r, *tmp; |
| 125 | int rc; | 125 | int rc; |