Skip to content

atm: remove more dead code

Jakub Kicinski 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 Latest9 patches 0 repliesApplied 9/9
  2. v19 patches 3 repliesSuperseded

Changes in v2 from the cover letter

- fix build warning on patch 4
v1: https://lore.kernel.org/[email protected]

Patches in v2 All 9 applied

#Subject and filesSizeRepliesApplied
1/9atm: remove AAL3/4 transport supportnet/atm/common.c net/atm/protocols.h net/atm/raw.c+0 -200 repliesApplied
2/9atm: remove the unused send_oam / push_oam callbacksdrivers/atm/solos-pci.c include/linux/atmdev.h net/atm/common.c +1 more+0 -120 repliesApplied
3/9atm: remove dead SONET PHY ioctlsnet/atm/ioctl.c net/atm/resources.c+0 -180 repliesApplied
4/9atm: remove the local ATM (NSAP) address registryinclude/linux/atmdev.h net/atm/Makefile net/atm/addr.c +6 more+2 -2840 repliesApplied
5/9atm: remove SVC socket support and the signaling daemon interfaceinclude/linux/atmdev.h net/atm/Makefile net/atm/br2684.c +9 more+12 -11850 repliesApplied
6/9atm: remove the unused change_qos device operationdrivers/atm/solos-pci.c include/linux/atmdev.h net/atm/common.c+2 -250 repliesApplied
7/9atm: remove the unused pre_send and send_bh device operationsinclude/linux/atmdev.h net/atm/common.c net/atm/raw.c+1 -140 repliesApplied
8/9atm: remove unused ATM PHY operationsdrivers/atm/solos-pci.c include/linux/atmdev.h+0 -140 repliesApplied
9/9atm: remove orphaned uAPI for deleted drivers, protocols and SVCsinclude/linux/atm_tcp.h include/uapi/linux/atm_eni.h include/uapi/linux/atm_he.h +11 more+0 -6190 repliesApplied

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v2 yet.

Read the v2 thread

Cover letter [PATCH net-next v2 0/9] atm: remove more dead code

Commit 6deb53595092 ("net: remove unused ATM protocols and legacy ATM device drivers") removed a good chunk of old ATM drivers. Our goal going forward is to limit the ATM support to PPPoATM used in ADSL deployments.

A recent burst of AI generated fixes for net/atm/signaling.c and net/atm/svc.c made me look closer at the remaining code. PPPoATM runs over permanent virtual circuits (PF_ATMPVC) with a statically configured VPI/VCI. We can drop switched virtual circuits (SVCs) and user-space signaling (atmsigd) support. While digging around I noticed a few more obviously dead pieces of code.

Annoyingly, I have applied one "fix" to QoS config which will now make net conflict with this series :/

v2:
- fix build warning on patch 4
v1: https://lore.kernel.org/[email protected]

Jakub Kicinski (9):
atm: remove AAL3/4 transport support
atm: remove the unused send_oam / push_oam callbacks
atm: remove dead SONET PHY ioctls
atm: remove the local ATM (NSAP) address registry
atm: remove SVC socket support and the signaling daemon interface
atm: remove the unused change_qos device operation
atm: remove the unused pre_send and send_bh device operations
atm: remove unused ATM PHY operations
atm: remove orphaned uAPI for deleted drivers, protocols and SVCs

 net/atm/Makefile                  |   2 +-
 include/linux/atm_tcp.h           |  24 --
 include/linux/atmdev.h            |  70 +--
 include/uapi/linux/atm_eni.h      |  24 --
 include/uapi/linux/atm_he.h       |  21 -
 include/uapi/linux/atm_idt77105.h |  29 --
 include/uapi/linux/atm_nicstar.h  |  54 ---
 include/uapi/linux/atm_tcp.h      |  62 ---
 include/uapi/linux/atm_zatm.h     |  47 --
 include/uapi/linux/atmarp.h       |  42 --
 include/uapi/linux/atmclip.h      |  22 -
 include/uapi/linux/atmdev.h       |  18 -
 include/uapi/linux/atmlec.h       |  92 ----
 include/uapi/linux/atmmpc.h       | 127 ------
 include/uapi/linux/atmsvc.h       |  56 ---
 net/atm/addr.h                    |  21 -
 net/atm/common.h                  |   5 -
 net/atm/protocols.h               |   1 -
 net/atm/signaling.h               |  31 --
 drivers/atm/solos-pci.c           |   4 -
 net/atm/addr.c                    | 162 -------
 net/atm/atm_sysfs.c               |  25 --
 net/atm/br2684.c                  |   3 +-
 net/atm/common.c                  |  73 +---
 net/atm/ioctl.c                   |  58 ---
 net/atm/pppoatm.c                 |   3 +-
 net/atm/proc.c                    |  56 ---
 net/atm/raw.c                     |  21 +-
 net/atm/resources.c               |  59 +--
 net/atm/signaling.c               | 297 -------------
 net/atm/svc.c                     | 695 ------------------------------
 31 files changed, 15 insertions(+), 2189 deletions(-)
 delete mode 100644 include/linux/atm_tcp.h
 delete mode 100644 include/uapi/linux/atm_eni.h
 delete mode 100644 include/uapi/linux/atm_he.h
 delete mode 100644 include/uapi/linux/atm_idt77105.h
 delete mode 100644 include/uapi/linux/atm_nicstar.h
 delete mode 100644 include/uapi/linux/atm_tcp.h
 delete mode 100644 include/uapi/linux/atm_zatm.h
 delete mode 100644 include/uapi/linux/atmarp.h
 delete mode 100644 include/uapi/linux/atmclip.h
 delete mode 100644 include/uapi/linux/atmlec.h
 delete mode 100644 include/uapi/linux/atmmpc.h
 delete mode 100644 include/uapi/linux/atmsvc.h
 delete mode 100644 net/atm/addr.h
 delete mode 100644 net/atm/signaling.h
 delete mode 100644 net/atm/addr.c
 delete mode 100644 net/atm/signaling.c
 delete mode 100644 net/atm/svc.c
Signature · 1 line
2.54.0