diff options
| author | Dave Airlie <airlied@redhat.com> | 2018-09-26 21:06:46 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-09-26 21:06:46 -0400 |
| commit | bf78296ab1cb215d0609ac6cff4e43e941e51265 (patch) | |
| tree | a193615b327d9ee538e71ca5f13bbfb4f3db4e6b /net/tipc/socket.h | |
| parent | 18eb2f6e19d77900695987e3a2b775cccbe5b84e (diff) | |
| parent | 6bf4ca7fbc85d80446ac01c0d1d77db4d91a6d84 (diff) | |
BackMerge v4.19-rc5 into drm-next
Sean Paul requested an -rc5 backmerge from some sun4i fixes.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'net/tipc/socket.h')
| -rw-r--r-- | net/tipc/socket.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/tipc/socket.h b/net/tipc/socket.h index aff9b2ae5a1f..5e575f205afe 100644 --- a/net/tipc/socket.h +++ b/net/tipc/socket.h | |||
| @@ -68,4 +68,7 @@ int tipc_nl_sk_walk(struct sk_buff *skb, struct netlink_callback *cb, | |||
| 68 | int (*skb_handler)(struct sk_buff *skb, | 68 | int (*skb_handler)(struct sk_buff *skb, |
| 69 | struct netlink_callback *cb, | 69 | struct netlink_callback *cb, |
| 70 | struct tipc_sock *tsk)); | 70 | struct tipc_sock *tsk)); |
| 71 | int tipc_dump_start(struct netlink_callback *cb); | ||
| 72 | int __tipc_dump_start(struct netlink_callback *cb, struct net *net); | ||
| 73 | int tipc_dump_done(struct netlink_callback *cb); | ||
| 71 | #endif | 74 | #endif |