diff options
| author | David S. Miller <davem@davemloft.net> | 2009-09-10 21:17:09 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-09-10 21:17:09 -0400 |
| commit | 9a0da0d19c573e01aded6ac17747d2efc5b1115f (patch) | |
| tree | 76294327bae4b3e45b16c690bda4b24951f237cf /net/netlink | |
| parent | ec282e9225be924479d4880b51f13524795bd8d3 (diff) | |
| parent | 8a56df0ae1690f8f42a3c6c4532f4b06f93febea (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
Diffstat (limited to 'net/netlink')
| -rw-r--r-- | net/netlink/af_netlink.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c index da3163d15ef0..d0ff382c40ca 100644 --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c | |||
| @@ -1705,7 +1705,7 @@ errout: | |||
| 1705 | } | 1705 | } |
| 1706 | 1706 | ||
| 1707 | int netlink_dump_start(struct sock *ssk, struct sk_buff *skb, | 1707 | int netlink_dump_start(struct sock *ssk, struct sk_buff *skb, |
| 1708 | struct nlmsghdr *nlh, | 1708 | const struct nlmsghdr *nlh, |
| 1709 | int (*dump)(struct sk_buff *skb, | 1709 | int (*dump)(struct sk_buff *skb, |
| 1710 | struct netlink_callback *), | 1710 | struct netlink_callback *), |
| 1711 | int (*done)(struct netlink_callback *)) | 1711 | int (*done)(struct netlink_callback *)) |