diff options
| author | David S. Miller <davem@davemloft.net> | 2020-05-19 12:50:14 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-05-19 12:50:14 -0700 |
| commit | 85bac6a52fb8aff6eb533cbb4a2d26c31af541b1 (patch) | |
| tree | faac3291c3f31e7f20b6ae7b9f3c91b54984659c /include | |
| parent | 2de499258659823b3c7207c5bda089c822b67d69 (diff) | |
| parent | e9a36ca5f6f302675e7e36101ffa0ca7f9b8779b (diff) | |
Merge branch 'iucv-next'
Julian Wiedmann says:
====================
net/iucv: updates 2020-05-19
please apply the following patch series for iucv to netdev's net-next
tree.
s390 dropped its support for power management, this removes the relevant
iucv code. Also, some easy cleanups I found mouldering in an old branch.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/iucv/af_iucv.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/include/net/iucv/af_iucv.h b/include/net/iucv/af_iucv.h index 14a490246be9..9259ce2b22f3 100644 --- a/include/net/iucv/af_iucv.h +++ b/include/net/iucv/af_iucv.h @@ -158,12 +158,4 @@ struct iucv_sock_list { atomic_t autobind_name; }; -__poll_t iucv_sock_poll(struct file *file, struct socket *sock, - poll_table *wait); -void iucv_sock_link(struct iucv_sock_list *l, struct sock *s); -void iucv_sock_unlink(struct iucv_sock_list *l, struct sock *s); -void iucv_accept_enqueue(struct sock *parent, struct sock *sk); -void iucv_accept_unlink(struct sock *sk); -struct sock *iucv_accept_dequeue(struct sock *parent, struct socket *newsock); - #endif /* __IUCV_H */ |