diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2021-01-29 07:36:24 +0300 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2021-01-29 07:36:25 +0300 |
| commit | 4915a40437635e40661d0b83c7e54dc2538bef37 (patch) | |
| tree | 0907d8244704df507c20db55d567e05b20a1099c /include | |
| parent | 14a6daf3a41cad9c21dcbd4cafe9220f77f5ea68 (diff) | |
| parent | 2c3b4456c812681f963ef67502c5b8e8f8e2933f (diff) | |
| download | linux-4915a40437635e40661d0b83c7e54dc2538bef37.tar.xz | |
Merge branch 'net-iucv-updates-2021-01-28'
Julian Wiedmann says:
====================
net/iucv: updates 2021-01-28
This reworks & simplifies the TX notification path in af_iucv, so that we
can send out SG skbs over TRANS_HIPER sockets. Also remove a noisy
WARN_ONCE() in the RX path.
====================
Link: https://lore.kernel.org/r/20210128114108.39409-1-jwi@linux.ibm.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/iucv/af_iucv.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/net/iucv/af_iucv.h b/include/net/iucv/af_iucv.h index 9259ce2b22f3..ff06246dbbb9 100644 --- a/include/net/iucv/af_iucv.h +++ b/include/net/iucv/af_iucv.h @@ -128,11 +128,12 @@ struct iucv_sock { u8 flags; u16 msglimit; u16 msglimit_peer; + atomic_t skbs_in_xmit; atomic_t msg_sent; atomic_t msg_recv; atomic_t pendings; int transport; - void (*sk_txnotify)(struct sk_buff *skb, + void (*sk_txnotify)(struct sock *sk, enum iucv_tx_notify n); }; |