diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-08 15:59:10 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-08 15:59:10 -0400 |
| commit | e46dc1dab969550d4136e9be0e7919ca09e49573 (patch) | |
| tree | 86dbc21796b402c895fd96d5197bf38d8d060545 /include | |
| parent | 87e2831c3fa39cbf6f7ab676bb5aef039b9659e2 (diff) | |
| parent | bf0b48dfc368c07c42b5a3a5658c8ee81b4283ac (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[IPv6]: Fix ICMPv6 redirect handling with target multicast address
[PKT_SCHED] cls_u32: error code isn't been propogated properly
[ROSE]: Fix rose.ko oops on unload
[TCP]: Fix fastpath_cnt_hint when GSO skb is partially ACKed
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/rose.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/rose.h b/include/net/rose.h index a4047d3cf5dd..e5bb084d8754 100644 --- a/include/net/rose.h +++ b/include/net/rose.h | |||
| @@ -188,7 +188,7 @@ extern void rose_kick(struct sock *); | |||
| 188 | extern void rose_enquiry_response(struct sock *); | 188 | extern void rose_enquiry_response(struct sock *); |
| 189 | 189 | ||
| 190 | /* rose_route.c */ | 190 | /* rose_route.c */ |
| 191 | extern struct rose_neigh rose_loopback_neigh; | 191 | extern struct rose_neigh *rose_loopback_neigh; |
| 192 | extern const struct file_operations rose_neigh_fops; | 192 | extern const struct file_operations rose_neigh_fops; |
| 193 | extern const struct file_operations rose_nodes_fops; | 193 | extern const struct file_operations rose_nodes_fops; |
| 194 | extern const struct file_operations rose_routes_fops; | 194 | extern const struct file_operations rose_routes_fops; |