diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /include/net/ip6_route.h | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'include/net/ip6_route.h')
| -rw-r--r-- | include/net/ip6_route.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h index 0e1b8aebaff8..4a808de7c0f6 100644 --- a/include/net/ip6_route.h +++ b/include/net/ip6_route.h | |||
| @@ -103,8 +103,7 @@ extern void rt6_pmtu_discovery(struct in6_addr *daddr, | |||
| 103 | 103 | ||
| 104 | struct netlink_callback; | 104 | struct netlink_callback; |
| 105 | 105 | ||
| 106 | struct rt6_rtnl_dump_arg | 106 | struct rt6_rtnl_dump_arg { |
| 107 | { | ||
| 108 | struct sk_buff *skb; | 107 | struct sk_buff *skb; |
| 109 | struct netlink_callback *cb; | 108 | struct netlink_callback *cb; |
| 110 | struct net *net; | 109 | struct net *net; |