Skip to content

tcp: Follow up for DCCP removal.

Kuniyuki Iwashima netdev 2 versions – Applied

Status from this message: This series was applied to netdev/net-next.git (main)

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest6 patches 2 repliesApplied 6/6
  2. v17 patches 7 repliesSuperseded

Changes in v2 from the cover letter

* Fix up my email address in patch 1~3
* Drop patch 2

Patches in v2 All 6 applied

#Subject and filesSizeRepliesApplied
1/6tcp: Remove sk_protocol test for tcp_twsk_unique().net/ipv4/inet_hashtables.c net/ipv6/inet6_hashtables.c+2 -40 repliesApplied
2/6tcp: Remove timewait_sock_ops.twsk_destructor().include/net/timewait_sock.h net/ipv4/inet_timewait_sock.c net/ipv4/tcp_ipv4.c +2 more+3 -120 repliesApplied
3/6tcp: Remove hashinfo test for inet6?_lookup_run_sk_lookup().net/ipv4/inet_hashtables.c net/ipv6/inet6_hashtables.c+2 -40 repliesApplied
4/6tcp: Don't pass hashinfo to socket lookup helpers.drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_rx.c drivers/net/ethernet/netronome/nfp/crypto/tls.c include/net/inet6_hashtables.h +15 more+94 -1231 replyApplied
5/6tcp: Don't pass hashinfo to inet_diag helpers.include/linux/inet_diag.h net/ipv4/inet_diag.c net/ipv4/tcp_diag.c+10 -231 replyApplied
6/6tcp: Move TCP-specific diag functions to tcp_diag.c.include/linux/inet_diag.h net/ipv4/inet_diag.c net/ipv4/tcp_diag.c+455 -4950 repliesApplied

Reviews trailers per patch

5 of 6 patches have a Reviewed-by or Acked-by.

PatchEric Dumazet
1/6R-b
2/6R-b
3/6R-b
4/6R-b
5/6R-b
6/6

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v2 thread

Cover letter [PATCH v2 net-next 0/6] tcp: Follow up for DCCP removal.

As I mentioned in [0], TCP still has code for DCCP.

This series cleans up such leftovers.

[0]: https://patch.msgid.link/[email protected]

Changes:
v2:
* Fix up my email address in patch 1~3
* Drop patch 2

v1: https://lore.kernel.org/netdev/[email protected]/

Kuniyuki Iwashima (6):
tcp: Remove sk_protocol test for tcp_twsk_unique().
tcp: Remove timewait_sock_ops.twsk_destructor().
tcp: Remove hashinfo test for inet6?_lookup_run_sk_lookup().
tcp: Don't pass hashinfo to socket lookup helpers.
tcp: Don't pass hashinfo to inet_diag helpers.
tcp: Move TCP-specific diag functions to tcp_diag.c.

 .../mellanox/mlx5/core/en_accel/ktls_rx.c     |   9 +-
 .../net/ethernet/netronome/nfp/crypto/tls.c   |   9 +-
 include/linux/inet_diag.h                     |  13 -
 include/net/inet6_hashtables.h                |  18 +-
 include/net/inet_hashtables.h                 |  37 +-
 include/net/timewait_sock.h                   |   7 -
 net/core/filter.c                             |   5 +-
 net/ipv4/esp4.c                               |   4 +-
 net/ipv4/inet_diag.c                          | 479 ------------------
 net/ipv4/inet_hashtables.c                    |  34 +-
 net/ipv4/inet_timewait_sock.c                 |   5 +-
 net/ipv4/netfilter/nf_socket_ipv4.c           |   3 +-
 net/ipv4/netfilter/nf_tproxy_ipv4.c           |   5 +-
 net/ipv4/tcp_diag.c                           | 463 ++++++++++++++++-
 net/ipv4/tcp_ipv4.c                           |  17 +-
 net/ipv4/tcp_minisocks.c                      |   1 -
 net/ipv4/tcp_offload.c                        |   3 +-
 net/ipv6/esp6.c                               |   4 +-
 net/ipv6/inet6_hashtables.c                   |  51 +-
 net/ipv6/netfilter/nf_socket_ipv6.c           |   3 +-
 net/ipv6/netfilter/nf_tproxy_ipv6.c           |   5 +-
 net/ipv6/tcp_ipv6.c                           |  15 +-
 net/ipv6/tcpv6_offload.c                      |   3 +-
 23 files changed, 549 insertions(+), 644 deletions(-)
Signature · 1 line
2.51.0.rc2.233.g662b1ed5c5-goog