caif: remove CAIF NETWORK LAYER

Remove CAIF (Communication CPU to Application CPU Interface), the
ST-Ericsson modem protocol. The subsystem has been orphaned since 2013.
The last meaningful changes from the maintainers were in March 2013:
  a8c7687bf216 ("caif_virtio: Check that vringh_config is not null")
  b2273be8d2df ("caif_virtio: Use vringh_notify_enable correctly")
  0d2e1a2926b1 ("caif_virtio: Introduce caif over virtio")

Not-so-coincidentally, according to "the Internet" ST-Ericsson officially
shut down its modem joint venture in Aug 2013.

If anyone is using this code please yell!

In the 13 years since, the code has accumulated 200 non-merge commits,
of which 71 were cross-tree API changes, 21 carried Fixes: tags, and
the remaining ~110 were cleanups, doc conversions, treewide refactors,
and one partial removal (caif_hsi, ca75bcf0a83b).

We are still getting fixes to this code, in the last 10 days there were
3 reports on security@ about CAIF that I have been CCed on.

UAPI constants (AF_CAIF, ARPHRD_CAIF, N_CAIF, VIRTIO_ID_CAIF) and the
SELinux classmap entry are intentionally kept for ABI stability.

Acked-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: Linus Walleij <linusw@kernel.org>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://patch.msgid.link/20260416182829.1440262-1-kuba@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

13 files changed, 0 insertions, 1281 deletions

diff --git a/include/linux/virtio_caif.h b/include/linux/virtio_caif.h
deleted file mode 100644
index ea722479510c..000000000000
--- a/include/linux/virtio_caif.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) ST-Ericsson AB 2012
- * Author: Sjur Brændeland <sjur.brandeland@stericsson.com>
- *
- * This header is BSD licensed so
- * anyone can use the definitions to implement compatible remote processors
- */
-
-#ifndef VIRTIO_CAIF_H
-#define VIRTIO_CAIF_H
-
-#include <linux/types.h>
-struct virtio_caif_transf_config {
-	__virtio16 headroom;
-	__virtio16 tailroom;
-	__virtio32 mtu;
-	u8 reserved[4];
-};
-
-struct virtio_caif_config {
-	struct virtio_caif_transf_config uplink, downlink;
-	u8 reserved[8];
-};
-#endif
diff --git a/include/net/caif/caif_dev.h b/include/net/caif/caif_dev.h
deleted file mode 100644
index b655d8666f55..000000000000
--- a/include/net/caif/caif_dev.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * Copyright (C) ST-Ericsson AB 2010
- * Author:	Sjur Brendeland
- */
-
-#ifndef CAIF_DEV_H_
-#define CAIF_DEV_H_
-
-#include <net/caif/caif_layer.h>
-#include <net/caif/cfcnfg.h>
-#include <net/caif/caif_device.h>
-#include <linux/caif/caif_socket.h>
-#include <linux/if.h>
-#include <linux/net.h>
-
-/**
- * struct caif_param - CAIF parameters.
- * @size:	Length of data
- * @data:	Binary Data Blob
- */
-struct caif_param {
-	u16  size;
-	u8   data[256];
-};
-
-/**
- * struct caif_connect_request - Request data for CAIF channel setup.
- * @protocol:		Type of CAIF protocol to use (at, datagram etc)
- * @sockaddr:		Socket address to connect.
- * @priority:		Priority of the connection.
- * @link_selector:	Link selector (high bandwidth or low latency)
- * @ifindex:		kernel index of the interface.
- * @param:		Connect Request parameters (CAIF_SO_REQ_PARAM).
- *
- * This struct is used when connecting a CAIF channel.
- * It contains all CAIF channel configuration options.
- */
-struct caif_connect_request {
-	enum caif_protocol_type protocol;
-	struct sockaddr_caif sockaddr;
-	enum caif_channel_priority priority;
-	enum caif_link_selector link_selector;
-	int ifindex;
-	struct caif_param param;
-};
-
-/**
- * caif_connect_client - Connect a client to CAIF Core Stack.
- * @config:		Channel setup parameters, specifying what address
- *			to connect on the Modem.
- * @client_layer:	User implementation of client layer. This layer
- *			MUST have receive and control callback functions
- *			implemented.
- * @ifindex:		Link layer interface index used for this connection.
- * @headroom:		Head room needed by CAIF protocol.
- * @tailroom:		Tail room needed by CAIF protocol.
- *
- * This function connects a CAIF channel. The Client must implement
- * the struct cflayer. This layer represents the Client layer and holds
- * receive functions and control callback functions. Control callback
- * function will receive information about connect/disconnect responses,
- * flow control etc (see enum caif_control).
- * E.g. CAIF Socket will call this function for each socket it connects
- * and have one client_layer instance for each socket.
- */
-int caif_connect_client(struct net *net,
-			struct caif_connect_request *conn_req,
-			struct cflayer *client_layer, int *ifindex,
-			int *headroom, int *tailroom);
-
-/**
- * caif_disconnect_client - Disconnects a client from the CAIF stack.
- *
- * @client_layer: Client layer to be disconnected.
- */
-int caif_disconnect_client(struct net *net, struct cflayer *client_layer);
-
-
-/**
- * caif_client_register_refcnt - register ref-count functions provided by client.
- *
- * @adapt_layer: Client layer using CAIF Stack.
- * @hold:	Function provided by client layer increasing ref-count
- * @put:	Function provided by client layer decreasing ref-count
- *
- * Client of the CAIF Stack must register functions for reference counting.
- * These functions are called by the CAIF Stack for every upstream packet,
- * and must therefore be implemented efficiently.
- *
- * Client should call caif_free_client when reference count degrease to zero.
- */
-
-void caif_client_register_refcnt(struct cflayer *adapt_layer,
-					void (*hold)(struct cflayer *lyr),
-					void (*put)(struct cflayer *lyr));
-/**
- * caif_free_client - Free memory used to manage the client in the CAIF Stack.
- *
- * @client_layer: Client layer to be removed.
- *
- * This function must be called from client layer in order to free memory.
- * Caller must guarantee that no packets are in flight upstream when calling
- * this function.
- */
-void caif_free_client(struct cflayer *adap_layer);
-
-/**
- * struct caif_enroll_dev - Enroll a net-device as a CAIF Link layer
- * @dev:		Network device to enroll.
- * @caifdev:		Configuration information from CAIF Link Layer
- * @link_support:	Link layer support layer
- * @head_room:		Head room needed by link support layer
- * @layer:		Lowest layer in CAIF stack
- * @rcv_fun:		Receive function for CAIF stack.
- *
- * This function enroll a CAIF link layer into CAIF Stack and
- * expects the interface to be able to handle CAIF payload.
- * The link_support layer is used to add any Link Layer specific
- * framing.
- */
-int caif_enroll_dev(struct net_device *dev, struct caif_dev_common *caifdev,
-			struct cflayer *link_support, int head_room,
-			struct cflayer **layer, int (**rcv_func)(
-				struct sk_buff *, struct net_device *,
-				struct packet_type *, struct net_device *));
-
-#endif /* CAIF_DEV_H_ */
diff --git a/include/net/caif/caif_device.h b/include/net/caif/caif_device.h
deleted file mode 100644
index 91d1fd5b44a4..000000000000
--- a/include/net/caif/caif_device.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * Copyright (C) ST-Ericsson AB 2010
- * Author:	Sjur Brendeland
- */
-
-#ifndef CAIF_DEVICE_H_
-#define CAIF_DEVICE_H_
-#include <linux/kernel.h>
-#include <linux/net.h>
-#include <linux/netdevice.h>
-#include <linux/caif/caif_socket.h>
-#include <net/caif/caif_device.h>
-
-/**
- * struct caif_dev_common - data shared between CAIF drivers and stack.
- * @flowctrl:		Flow Control callback function. This function is
- *                      supplied by CAIF Core Stack and is used by CAIF
- *                      Link Layer to send flow-stop to CAIF Core.
- *                      The flow information will be distributed to all
- *                      clients of CAIF.
- *
- * @link_select:	Profile of device, either high-bandwidth or
- *			low-latency. This member is set by CAIF Link
- *			Layer Device in	order to indicate if this device
- *			is a high bandwidth or low latency device.
- *
- * @use_frag:		CAIF Frames may be fragmented.
- *			Is set by CAIF Link Layer in order to indicate if the
- *			interface receives fragmented frames that must be
- *			assembled by CAIF Core Layer.
- *
- * @use_fcs:		Indicate if Frame CheckSum (fcs) is used.
- *			Is set if the physical interface is
- *			using Frame Checksum on the CAIF Frames.
- *
- * @use_stx:		Indicate STart of frame eXtension (stx) in use.
- *			Is set if the CAIF Link Layer expects
- *			CAIF Frames to start with the STX byte.
- *
- * This structure is shared between the CAIF drivers and the CAIF stack.
- * It is used by the device to register its behavior.
- * CAIF Core layer must set the member flowctrl in order to supply
- * CAIF Link Layer with the flow control function.
- *
- */
- struct caif_dev_common {
-	void (*flowctrl)(struct net_device *net, int on);
-	enum caif_link_selector link_select;
-	int use_frag;
-	int use_fcs;
-	int use_stx;
-};
-
-#endif	/* CAIF_DEVICE_H_ */
diff --git a/include/net/caif/caif_layer.h b/include/net/caif/caif_layer.h
deleted file mode 100644
index 053e7c6a6a66..000000000000
--- a/include/net/caif/caif_layer.h
+++ /dev/null
@@ -1,277 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * Copyright (C) ST-Ericsson AB 2010
- * Author:	Sjur Brendeland
- */
-
-#ifndef CAIF_LAYER_H_
-#define CAIF_LAYER_H_
-
-#include <linux/list.h>
-
-struct cflayer;
-struct cfpkt;
-struct caif_payload_info;
-
-#define CAIF_LAYER_NAME_SZ 16
-
-/**
- * caif_assert() - Assert function for CAIF.
- * @assert: expression to evaluate.
- *
- * This function will print a error message and a do WARN_ON if the
- * assertion fails. Normally this will do a stack up at the current location.
- */
-#define caif_assert(assert)					\
-do {								\
-	if (!(assert)) {					\
-		pr_err("caif:Assert detected:'%s'\n", #assert); \
-		WARN_ON(!(assert));				\
-	}							\
-} while (0)
-
-/**
- * enum caif_ctrlcmd - CAIF Stack Control Signaling sent in layer.ctrlcmd().
- *
- * @CAIF_CTRLCMD_FLOW_OFF_IND:		Flow Control is OFF, transmit function
- *					should stop sending data
- *
- * @CAIF_CTRLCMD_FLOW_ON_IND:		Flow Control is ON, transmit function
- *					can start sending data
- *
- * @CAIF_CTRLCMD_REMOTE_SHUTDOWN_IND:	Remote end modem has decided to close
- *					down channel
- *
- * @CAIF_CTRLCMD_INIT_RSP:		Called initially when the layer below
- *					has finished initialization
- *
- * @CAIF_CTRLCMD_DEINIT_RSP:		Called when de-initialization is
- *					complete
- *
- * @CAIF_CTRLCMD_INIT_FAIL_RSP:		Called if initialization fails
- *
- * @_CAIF_CTRLCMD_PHYIF_FLOW_OFF_IND:	CAIF Link layer temporarily cannot
- *					send more packets.
- * @_CAIF_CTRLCMD_PHYIF_FLOW_ON_IND:	Called if CAIF Link layer is able
- *					to send packets again.
- * @_CAIF_CTRLCMD_PHYIF_DOWN_IND:	Called if CAIF Link layer is going
- *					down.
- *
- * These commands are sent upwards in the CAIF stack to the CAIF Client.
- * They are used for signaling originating from the modem or CAIF Link Layer.
- * These are either responses (*_RSP) or events (*_IND).
- */
-enum caif_ctrlcmd {
-	CAIF_CTRLCMD_FLOW_OFF_IND,
-	CAIF_CTRLCMD_FLOW_ON_IND,
-	CAIF_CTRLCMD_REMOTE_SHUTDOWN_IND,
-	CAIF_CTRLCMD_INIT_RSP,
-	CAIF_CTRLCMD_DEINIT_RSP,
-	CAIF_CTRLCMD_INIT_FAIL_RSP,
-	_CAIF_CTRLCMD_PHYIF_FLOW_OFF_IND,
-	_CAIF_CTRLCMD_PHYIF_FLOW_ON_IND,
-	_CAIF_CTRLCMD_PHYIF_DOWN_IND,
-};
-
-/**
- * enum caif_modemcmd -	 Modem Control Signaling, sent from CAIF Client
- *			 to the CAIF Link Layer or modem.
- *
- * @CAIF_MODEMCMD_FLOW_ON_REQ:		Flow Control is ON, transmit function
- *					can start sending data.
- *
- * @CAIF_MODEMCMD_FLOW_OFF_REQ:		Flow Control is OFF, transmit function
- *					should stop sending data.
- *
- * @_CAIF_MODEMCMD_PHYIF_USEFULL:	Notify physical layer that it is in use
- *
- * @_CAIF_MODEMCMD_PHYIF_USELESS:	Notify physical layer that it is
- *					no longer in use.
- *
- * These are requests sent 'downwards' in the stack.
- * Flow ON, OFF can be indicated to the modem.
- */
-enum caif_modemcmd {
-	CAIF_MODEMCMD_FLOW_ON_REQ = 0,
-	CAIF_MODEMCMD_FLOW_OFF_REQ = 1,
-	_CAIF_MODEMCMD_PHYIF_USEFULL = 3,
-	_CAIF_MODEMCMD_PHYIF_USELESS = 4
-};
-
-/**
- * enum caif_direction - CAIF Packet Direction.
- * Indicate if a packet is to be sent out or to be received in.
- * @CAIF_DIR_IN:		Incoming packet received.
- * @CAIF_DIR_OUT:		Outgoing packet to be transmitted.
- */
-enum caif_direction {
-	CAIF_DIR_IN = 0,
-	CAIF_DIR_OUT = 1
-};
-
-/**
- * struct cflayer - CAIF Stack layer.
- * Defines the framework for the CAIF Core Stack.
- * @up:		Pointer up to the layer above.
- * @dn:		Pointer down to the layer below.
- * @node:	List node used when layer participate in a list.
- * @receive:	Packet receive function.
- * @transmit:	Packet transmit function.
- * @ctrlcmd:	Used for control signalling upwards in the stack.
- * @modemcmd:	Used for control signaling downwards in the stack.
- * @id:		The identity of this layer
- * @name:	Name of the layer.
- *
- *  This structure defines the layered structure in CAIF.
- *
- *  It defines CAIF layering structure, used by all CAIF Layers and the
- *  layers interfacing CAIF.
- *
- *  In order to integrate with CAIF an adaptation layer on top of the CAIF stack
- *  and PHY layer below the CAIF stack
- *  must be implemented. These layer must follow the design principles below.
- *
- *  Principles for layering of protocol layers:
- *    - All layers must use this structure. If embedding it, then place this
- *	structure first in the layer specific structure.
- *
- *    - Each layer should not depend on any others layer's private data.
- *
- *    - In order to send data upwards do
- *	layer->up->receive(layer->up, packet);
- *
- *    - In order to send data downwards do
- *	layer->dn->transmit(layer->dn, info, packet);
- */
-struct cflayer {
-	struct cflayer *up;
-	struct cflayer *dn;
-	struct list_head node;
-
-	/*
-	 *  receive() - Receive Function (non-blocking).
-	 *  Contract: Each layer must implement a receive function passing the
-	 *  CAIF packets upwards in the stack.
-	 *	Packet handling rules:
-	 *	      - The CAIF packet (cfpkt) ownership is passed to the
-	 *		called receive function. This means that the
-	 *		packet cannot be accessed after passing it to the
-	 *		above layer using up->receive().
-	 *
-	 *	      - If parsing of the packet fails, the packet must be
-	 *		destroyed and negative error code returned
-	 *		from the function.
-	 *		EXCEPTION: If the framing layer (cffrml) returns
-	 *			-EILSEQ, the packet is not freed.
-	 *
-	 *	      - If parsing succeeds (and above layers return OK) then
-	 *		      the function must return a value >= 0.
-	 *
-	 *  Returns result < 0 indicates an error, 0 or positive value
-	 *	     indicates success.
-	 *
-	 *  @layr: Pointer to the current layer the receive function is
-	 *		implemented for (this pointer).
-	 *  @cfpkt: Pointer to CaifPacket to be handled.
-	 */
-	int (*receive)(struct cflayer *layr, struct cfpkt *cfpkt);
-
-	/*
-	 *  transmit() - Transmit Function (non-blocking).
-	 *  Contract: Each layer must implement a transmit function passing the
-	 *	CAIF packet downwards in the stack.
-	 *	Packet handling rules:
-	 *	      - The CAIF packet (cfpkt) ownership is passed to the
-	 *		transmit function. This means that the packet
-	 *		cannot be accessed after passing it to the below
-	 *		layer using dn->transmit().
-	 *
-	 *	      - Upon error the packet ownership is still passed on,
-	 *		so the packet shall be freed where error is detected.
-	 *		Callers of the transmit function shall not free packets,
-	 *		but errors shall be returned.
-	 *
-	 *	      - Return value less than zero means error, zero or
-	 *		greater than zero means OK.
-	 *
-	 *  Returns result < 0 indicates an error, 0 or positive value
-	 *		indicates success.
-	 *
-	 *  @layr:	Pointer to the current layer the receive function
-	 *		isimplemented for (this pointer).
-	 *  @cfpkt:	 Pointer to CaifPacket to be handled.
-	 */
-	int (*transmit) (struct cflayer *layr, struct cfpkt *cfpkt);
-
-	/*
-	 *  cttrlcmd() - Control Function upwards in CAIF Stack  (non-blocking).
-	 *  Used for signaling responses (CAIF_CTRLCMD_*_RSP)
-	 *  and asynchronous events from the modem  (CAIF_CTRLCMD_*_IND)
-	 *
-	 *  @layr:	Pointer to the current layer the receive function
-	 *		is implemented for (this pointer).
-	 *  @ctrl:	Control Command.
-	 */
-	void (*ctrlcmd) (struct cflayer *layr, enum caif_ctrlcmd ctrl,
-			 int phyid);
-
-	/*
-	 *  modemctrl() - Control Function used for controlling the modem.
-	 *  Used to signal down-wards in the CAIF stack.
-	 *  Returns 0 on success, < 0 upon failure.
-	 *
-	 *  @layr:	Pointer to the current layer the receive function
-	 *		is implemented for (this pointer).
-	 *  @ctrl:  Control Command.
-	 */
-	int (*modemcmd) (struct cflayer *layr, enum caif_modemcmd ctrl);
-
-	unsigned int id;
-	char name[CAIF_LAYER_NAME_SZ];
-};
-
-/**
- * layer_set_up() - Set the up pointer for a specified layer.
- *  @layr: Layer where up pointer shall be set.
- *  @above: Layer above.
- */
-#define layer_set_up(layr, above) ((layr)->up = (struct cflayer *)(above))
-
-/**
- *  layer_set_dn() - Set the down pointer for a specified layer.
- *  @layr:  Layer where down pointer shall be set.
- *  @below: Layer below.
- */
-#define layer_set_dn(layr, below) ((layr)->dn = (struct cflayer *)(below))
-
-/**
- * struct dev_info - Physical Device info information about physical layer.
- * @dev:	Pointer to native physical device.
- * @id:		Physical ID of the physical connection used by the
- *		logical CAIF connection. Used by service layers to
- *		identify their physical id to Caif MUX (CFMUXL)so
- *		that the MUX can add the correct physical ID to the
- *		packet.
- */
-struct dev_info {
-	void *dev;
-	unsigned int id;
-};
-
-/**
- * struct caif_payload_info - Payload information embedded in packet (sk_buff).
- *
- * @dev_info:	Information about the receiving device.
- *
- * @hdr_len:	Header length, used to align pay load on 32bit boundary.
- *
- * @channel_id: Channel ID of the logical CAIF connection.
- *		Used by mux to insert channel id into the caif packet.
- */
-struct caif_payload_info {
-	struct dev_info *dev_info;
-	unsigned short hdr_len;
-	unsigned short channel_id;
-};
-
-#endif	/* CAIF_LAYER_H_ */
diff --git a/include/net/caif/cfcnfg.h b/include/net/caif/cfcnfg.h
deleted file mode 100644
index 8819ff4db35a..000000000000
--- a/include/net/caif/cfcnfg.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * Copyright (C) ST-Ericsson AB 2010
- * Author:	Sjur Brendeland
- */
-
-#ifndef CFCNFG_H_
-#define CFCNFG_H_
-#include <linux/spinlock.h>
-#include <linux/netdevice.h>
-#include <net/caif/caif_layer.h>
-#include <net/caif/cfctrl.h>
-
-struct cfcnfg;
-
-/**
- * enum cfcnfg_phy_preference - Physical preference HW Abstraction
- *
- * @CFPHYPREF_UNSPECIFIED:	Default physical interface
- *
- * @CFPHYPREF_LOW_LAT:		Default physical interface for low-latency
- *				traffic
- * @CFPHYPREF_HIGH_BW:		Default physical interface for high-bandwidth
- *				traffic
- * @CFPHYPREF_LOOP:		TEST only Loopback interface simulating modem
- *				responses.
- *
- */
-enum cfcnfg_phy_preference {
-	CFPHYPREF_UNSPECIFIED,
-	CFPHYPREF_LOW_LAT,
-	CFPHYPREF_HIGH_BW,
-	CFPHYPREF_LOOP
-};
-
-/**
- * cfcnfg_create() - Get the CAIF configuration object given network.
- * @net:	Network for the CAIF configuration object.
- */
-struct cfcnfg *get_cfcnfg(struct net *net);
-
-/**
- * cfcnfg_create() - Create the CAIF configuration object.
- */
-struct cfcnfg *cfcnfg_create(void);
-
-/**
- * cfcnfg_remove() -  Remove the CFCNFG object
- * @cfg: config object
- */
-void cfcnfg_remove(struct cfcnfg *cfg);
-
-/**
- * cfcnfg_add_phy_layer() - Adds a physical layer to the CAIF stack.
- * @cnfg:	Pointer to a CAIF configuration object, created by
- *		cfcnfg_create().
- * @dev:	Pointer to link layer device
- * @phy_layer:	Specify the physical layer. The transmit function
- *		MUST be set in the structure.
- * @pref:	The phy (link layer) preference.
- * @link_support: Protocol implementation for link layer specific protocol.
- * @fcs:	Specify if checksum is used in CAIF Framing Layer.
- * @head_room:	Head space needed by link specific protocol.
- */
-int
-cfcnfg_add_phy_layer(struct cfcnfg *cnfg,
-		     struct net_device *dev, struct cflayer *phy_layer,
-		     enum cfcnfg_phy_preference pref,
-		     struct cflayer *link_support,
-		     bool fcs, int head_room);
-
-/**
- * cfcnfg_del_phy_layer - Deletes an phy layer from the CAIF stack.
- *
- * @cnfg:	Pointer to a CAIF configuration object, created by
- *		cfcnfg_create().
- * @phy_layer:	Adaptation layer to be removed.
- */
-int cfcnfg_del_phy_layer(struct cfcnfg *cnfg, struct cflayer *phy_layer);
-
-/**
- * cfcnfg_set_phy_state() - Set the state of the physical interface device.
- * @cnfg:	Configuration object
- * @phy_layer:	Physical Layer representation
- * @up:	State of device
- */
-int cfcnfg_set_phy_state(struct cfcnfg *cnfg, struct cflayer *phy_layer,
-				bool up);
-
-#endif				/* CFCNFG_H_ */
diff --git a/include/net/caif/cfctrl.h b/include/net/caif/cfctrl.h
deleted file mode 100644
index 86d17315c8a1..000000000000
--- a/include/net/caif/cfctrl.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * Copyright (C) ST-Ericsson AB 2010
- * Author:	Sjur Brendeland
- */
-
-#ifndef CFCTRL_H_
-#define CFCTRL_H_
-#include <net/caif/caif_layer.h>
-#include <net/caif/cfsrvl.h>
-
-/* CAIF Control packet commands */
-enum cfctrl_cmd {
-	CFCTRL_CMD_LINK_SETUP = 0,
-	CFCTRL_CMD_LINK_DESTROY = 1,
-	CFCTRL_CMD_LINK_ERR = 2,
-	CFCTRL_CMD_ENUM = 3,
-	CFCTRL_CMD_SLEEP = 4,
-	CFCTRL_CMD_WAKE = 5,
-	CFCTRL_CMD_LINK_RECONF = 6,
-	CFCTRL_CMD_START_REASON = 7,
-	CFCTRL_CMD_RADIO_SET = 8,
-	CFCTRL_CMD_MODEM_SET = 9,
-	CFCTRL_CMD_MASK = 0xf
-};
-
-/* Channel types */
-enum cfctrl_srv {
-	CFCTRL_SRV_DECM = 0,
-	CFCTRL_SRV_VEI = 1,
-	CFCTRL_SRV_VIDEO = 2,
-	CFCTRL_SRV_DBG = 3,
-	CFCTRL_SRV_DATAGRAM = 4,
-	CFCTRL_SRV_RFM = 5,
-	CFCTRL_SRV_UTIL = 6,
-	CFCTRL_SRV_MASK = 0xf
-};
-
-#define CFCTRL_RSP_BIT 0x20
-#define CFCTRL_ERR_BIT 0x10
-
-struct cfctrl_rsp {
-	void (*linksetup_rsp)(struct cflayer *layer, u8 linkid,
-			      enum cfctrl_srv serv, u8 phyid,
-			      struct cflayer *adapt_layer);
-	void (*linkdestroy_rsp)(struct cflayer *layer, u8 linkid);
-	void (*linkerror_ind)(void);
-	void (*enum_rsp)(void);
-	void (*sleep_rsp)(void);
-	void (*wake_rsp)(void);
-	void (*restart_rsp)(void);
-	void (*radioset_rsp)(void);
-	void (*reject_rsp)(struct cflayer *layer, u8 linkid,
-				struct cflayer *client_layer);
-};
-
-/* Link Setup Parameters for CAIF-Links. */
-struct cfctrl_link_param {
-	enum cfctrl_srv linktype;/* (T3,T0) Type of Channel */
-	u8 priority;		  /* (P4,P0) Priority of the channel */
-	u8 phyid;		  /* (U2-U0) Physical interface to connect */
-	u8 endpoint;		  /* (E1,E0) Endpoint for data channels */
-	u8 chtype;		  /* (H1,H0) Channel-Type, applies to
-				   *            VEI, DEBUG */
-	union {
-		struct {
-			u8 connid;	/*  (D7,D0) Video LinkId */
-		} video;
-
-		struct {
-			u32 connid;	/* (N31,Ngit0) Connection ID used
-					 *  for Datagram */
-		} datagram;
-
-		struct {
-			u32 connid;	/* Connection ID used for RFM */
-			char volume[20];	/* Volume to mount for RFM */
-		} rfm;		/* Configuration for RFM */
-
-		struct {
-			u16 fifosize_kb;	/* Psock FIFO size in KB */
-			u16 fifosize_bufs;	/* Psock # signal buffers */
-			char name[16];	/* Name of the PSOCK service */
-			u8 params[255];	/* Link setup Parameters> */
-			u16 paramlen;	/* Length of Link Setup
-						 *   Parameters */
-		} utility;	/* Configuration for Utility Links (Psock) */
-	} u;
-};
-
-/* This structure is used internally in CFCTRL */
-struct cfctrl_request_info {
-	int sequence_no;
-	enum cfctrl_cmd cmd;
-	u8 channel_id;
-	struct cfctrl_link_param param;
-	struct cflayer *client_layer;
-	struct list_head list;
-};
-
-struct cfctrl {
-	struct cfsrvl serv;
-	struct cfctrl_rsp res;
-	atomic_t req_seq_no;
-	atomic_t rsp_seq_no;
-	struct list_head list;
-	/* Protects from simultaneous access to first_req list */
-	spinlock_t info_list_lock;
-#ifndef CAIF_NO_LOOP
-	u8 loop_linkid;
-	int loop_linkused[256];
-	/* Protects simultaneous access to loop_linkid and loop_linkused */
-	spinlock_t loop_linkid_lock;
-#endif
-
-};
-
-void cfctrl_enum_req(struct cflayer *cfctrl, u8 physlinkid);
-int cfctrl_linkup_request(struct cflayer *cfctrl,
-			   struct cfctrl_link_param *param,
-			   struct cflayer *user_layer);
-int  cfctrl_linkdown_req(struct cflayer *cfctrl, u8 linkid,
-			 struct cflayer *client);
-
-struct cflayer *cfctrl_create(void);
-struct cfctrl_rsp *cfctrl_get_respfuncs(struct cflayer *layer);
-int cfctrl_cancel_req(struct cflayer *layr, struct cflayer *adap_layer);
-void cfctrl_remove(struct cflayer *layr);
-
-#endif				/* CFCTRL_H_ */
diff --git a/include/net/caif/cffrml.h b/include/net/caif/cffrml.h
deleted file mode 100644
index 1ab8a80ede4d..000000000000
--- a/include/net/caif/cffrml.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * Copyright (C) ST-Ericsson AB 2010
- * Author:	Sjur Brendeland
- */
-
-#ifndef CFFRML_H_
-#define CFFRML_H_
-#include <net/caif/caif_layer.h>
-#include <linux/netdevice.h>
-
-struct cffrml;
-struct cflayer *cffrml_create(u16 phyid, bool use_fcs);
-void cffrml_free(struct cflayer *layr);
-void cffrml_set_uplayer(struct cflayer *this, struct cflayer *up);
-void cffrml_set_dnlayer(struct cflayer *this, struct cflayer *dn);
-void cffrml_put(struct cflayer *layr);
-void cffrml_hold(struct cflayer *layr);
-int cffrml_refcnt_read(struct cflayer *layr);
-
-#endif /* CFFRML_H_ */
diff --git a/include/net/caif/cfmuxl.h b/include/net/caif/cfmuxl.h
deleted file mode 100644
index 92ccb2648309..000000000000
--- a/include/net/caif/cfmuxl.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * Copyright (C) ST-Ericsson AB 2010
- * Author:	Sjur Brendeland
- */
-
-#ifndef CFMUXL_H_
-#define CFMUXL_H_
-#include <net/caif/caif_layer.h>
-
-struct cfsrvl;
-struct cffrml;
-
-struct cflayer *cfmuxl_create(void);
-int cfmuxl_set_uplayer(struct cflayer *layr, struct cflayer *up, u8 linkid);
-struct cflayer *cfmuxl_remove_dnlayer(struct cflayer *layr, u8 phyid);
-int cfmuxl_set_dnlayer(struct cflayer *layr, struct cflayer *up, u8 phyid);
-struct cflayer *cfmuxl_remove_uplayer(struct cflayer *layr, u8 linkid);
-
-#endif				/* CFMUXL_H_ */
diff --git a/include/net/caif/cfpkt.h b/include/net/caif/cfpkt.h
deleted file mode 100644
index acf664227d96..000000000000
--- a/include/net/caif/cfpkt.h
+++ /dev/null
@@ -1,232 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * Copyright (C) ST-Ericsson AB 2010
- * Author:	Sjur Brendeland
- */
-
-#ifndef CFPKT_H_
-#define CFPKT_H_
-#include <net/caif/caif_layer.h>
-#include <linux/types.h>
-struct cfpkt;
-
-/* Create a CAIF packet.
- * len: Length of packet to be created
- * @return New packet.
- */
-struct cfpkt *cfpkt_create(u16 len);
-
-/*
- * Destroy a CAIF Packet.
- * pkt Packet to be destroyed.
- */
-void cfpkt_destroy(struct cfpkt *pkt);
-
-/*
- * Extract header from packet.
- *
- * pkt Packet to extract header data from.
- * data Pointer to copy the header data into.
- * len Length of head data to copy.
- * @return zero on success and error code upon failure
- */
-int cfpkt_extr_head(struct cfpkt *pkt, void *data, u16 len);
-
-static inline u8 cfpkt_extr_head_u8(struct cfpkt *pkt)
-{
-	u8 tmp;
-
-	cfpkt_extr_head(pkt, &tmp, 1);
-
-	return tmp;
-}
-
-static inline u16 cfpkt_extr_head_u16(struct cfpkt *pkt)
-{
-	__le16 tmp;
-
-	cfpkt_extr_head(pkt, &tmp, 2);
-
-	return le16_to_cpu(tmp);
-}
-
-static inline u32 cfpkt_extr_head_u32(struct cfpkt *pkt)
-{
-	__le32 tmp;
-
-	cfpkt_extr_head(pkt, &tmp, 4);
-
-	return le32_to_cpu(tmp);
-}
-
-/*
- * Peek header from packet.
- * Reads data from packet without changing packet.
- *
- * pkt Packet to extract header data from.
- * data Pointer to copy the header data into.
- * len Length of head data to copy.
- * @return zero on success and error code upon failure
- */
-int cfpkt_peek_head(struct cfpkt *pkt, void *data, u16 len);
-
-/*
- * Extract header from trailer (end of packet).
- *
- * pkt Packet to extract header data from.
- * data Pointer to copy the trailer data into.
- * len Length of header data to copy.
- * @return zero on success and error code upon failure
- */
-int cfpkt_extr_trail(struct cfpkt *pkt, void *data, u16 len);
-
-/*
- * Add header to packet.
- *
- *
- * pkt Packet to add header data to.
- * data Pointer to data to copy into the header.
- * len Length of header data to copy.
- * @return zero on success and error code upon failure
- */
-int cfpkt_add_head(struct cfpkt *pkt, const void *data, u16 len);
-
-/*
- * Add trailer to packet.
- *
- *
- * pkt Packet to add trailer data to.
- * data Pointer to data to copy into the trailer.
- * len Length of trailer data to copy.
- * @return zero on success and error code upon failure
- */
-int cfpkt_add_trail(struct cfpkt *pkt, const void *data, u16 len);
-
-/*
- * Pad trailer on packet.
- * Moves data pointer in packet, no content copied.
- *
- * pkt Packet in which to pad trailer.
- * len Length of padding to add.
- * @return zero on success and error code upon failure
- */
-int cfpkt_pad_trail(struct cfpkt *pkt, u16 len);
-
-/*
- * Add a single byte to packet body (tail).
- *
- * pkt Packet in which to add byte.
- * data Byte to add.
- * @return zero on success and error code upon failure
- */
-int cfpkt_addbdy(struct cfpkt *pkt, const u8 data);
-
-/*
- * Add a data to packet body (tail).
- *
- * pkt Packet in which to add data.
- * data Pointer to data to copy into the packet body.
- * len Length of data to add.
- * @return zero on success and error code upon failure
- */
-int cfpkt_add_body(struct cfpkt *pkt, const void *data, u16 len);
-
-/*
- * Checks whether there are more data to process in packet.
- * pkt Packet to check.
- * @return true if more data are available in packet false otherwise
- */
-bool cfpkt_more(struct cfpkt *pkt);
-
-/*
- * Checks whether the packet is erroneous,
- * i.e. if it has been attempted to extract more data than available in packet
- * or writing more data than has been allocated in cfpkt_create().
- * pkt Packet to check.
- * @return true on error false otherwise
- */
-bool cfpkt_erroneous(struct cfpkt *pkt);
-
-/*
- * Get the packet length.
- * pkt Packet to get length from.
- * @return Number of bytes in packet.
- */
-u16 cfpkt_getlen(struct cfpkt *pkt);
-
-/*
- * Set the packet length, by adjusting the trailer pointer according to length.
- * pkt Packet to set length.
- * len Packet length.
- * @return Number of bytes in packet.
- */
-int cfpkt_setlen(struct cfpkt *pkt, u16 len);
-
-/*
- * cfpkt_append - Appends a packet's data to another packet.
- * dstpkt:    Packet to append data into, WILL BE FREED BY THIS FUNCTION
- * addpkt:    Packet to be appended and automatically released,
- *            WILL BE FREED BY THIS FUNCTION.
- * expectlen: Packet's expected total length. This should be considered
- *            as a hint.
- * NB: Input packets will be destroyed after appending and cannot be used
- * after calling this function.
- * @return    The new appended packet.
- */
-struct cfpkt *cfpkt_append(struct cfpkt *dstpkt, struct cfpkt *addpkt,
-		      u16 expectlen);
-
-/*
- * cfpkt_split - Split a packet into two packets at the specified split point.
- * pkt: Packet to be split (will contain the first part of the data on exit)
- * pos: Position to split packet in two parts.
- * @return The new packet, containing the second part of the data.
- */
-struct cfpkt *cfpkt_split(struct cfpkt *pkt, u16 pos);
-
-/*
- * Iteration function, iterates the packet buffers from start to end.
- *
- * Checksum iteration function used to iterate buffers
- * (we may have packets consisting of a chain of buffers)
- * pkt:       Packet to calculate checksum for
- * iter_func: Function pointer to iteration function
- * chks:      Checksum calculated so far.
- * buf:       Pointer to the buffer to checksum
- * len:       Length of buf.
- * data:      Initial checksum value.
- * @return    Checksum of buffer.
- */
-
-int cfpkt_iterate(struct cfpkt *pkt,
-		u16 (*iter_func)(u16 chks, void *buf, u16 len),
-		u16 data);
-
-/* Map from a "native" packet (e.g. Linux Socket Buffer) to a CAIF packet.
- *  dir - Direction indicating whether this packet is to be sent or received.
- *  nativepkt  - The native packet to be transformed to a CAIF packet
- *  @return The mapped CAIF Packet CFPKT.
- */
-struct cfpkt *cfpkt_fromnative(enum caif_direction dir, void *nativepkt);
-
-/* Map from a CAIF packet to a "native" packet (e.g. Linux Socket Buffer).
- *  pkt  - The CAIF packet to be transformed into a "native" packet.
- *  @return The native packet transformed from a CAIF packet.
- */
-void *cfpkt_tonative(struct cfpkt *pkt);
-
-/*
- * Returns packet information for a packet.
- * pkt Packet to get info from;
- * @return Packet information
- */
-struct caif_payload_info *cfpkt_info(struct cfpkt *pkt);
-
-/** cfpkt_set_prio - set priority for a CAIF packet.
- *
- * @pkt: The CAIF packet to be adjusted.
- * @prio: one of TC_PRIO_ constants.
- */
-void cfpkt_set_prio(struct cfpkt *pkt, int prio);
-
-#endif				/* CFPKT_H_ */
diff --git a/include/net/caif/cfserl.h b/include/net/caif/cfserl.h
deleted file mode 100644
index 67cce8757175..000000000000
--- a/include/net/caif/cfserl.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * Copyright (C) ST-Ericsson AB 2010
- * Author:	Sjur Brendeland
- */
-
-#ifndef CFSERL_H_
-#define CFSERL_H_
-#include <net/caif/caif_layer.h>
-
-struct cflayer *cfserl_create(int instance, bool use_stx);
-void cfserl_release(struct cflayer *layer);
-#endif
diff --git a/include/net/caif/cfsrvl.h b/include/net/caif/cfsrvl.h
deleted file mode 100644
index a000dc45f966..000000000000
--- a/include/net/caif/cfsrvl.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * Copyright (C) ST-Ericsson AB 2010
- * Author:	Sjur Brendeland
- */
-
-#ifndef CFSRVL_H_
-#define CFSRVL_H_
-#include <linux/list.h>
-#include <linux/stddef.h>
-#include <linux/types.h>
-#include <linux/kref.h>
-#include <linux/rculist.h>
-
-struct cfsrvl {
-	struct cflayer layer;
-	bool open;
-	bool phy_flow_on;
-	bool modem_flow_on;
-	bool supports_flowctrl;
-	void (*release)(struct cflayer *layer);
-	struct dev_info dev_info;
-	void (*hold)(struct cflayer *lyr);
-	void (*put)(struct cflayer *lyr);
-	struct rcu_head rcu;
-};
-
-struct cflayer *cfvei_create(u8 linkid, struct dev_info *dev_info);
-struct cflayer *cfdgml_create(u8 linkid, struct dev_info *dev_info);
-struct cflayer *cfutill_create(u8 linkid, struct dev_info *dev_info);
-struct cflayer *cfvidl_create(u8 linkid, struct dev_info *dev_info);
-struct cflayer *cfrfml_create(u8 linkid, struct dev_info *dev_info,
-				int mtu_size);
-struct cflayer *cfdbgl_create(u8 linkid, struct dev_info *dev_info);
-
-bool cfsrvl_phyid_match(struct cflayer *layer, int phyid);
-
-void cfsrvl_init(struct cfsrvl *service,
-			u8 channel_id,
-			struct dev_info *dev_info,
-			bool supports_flowctrl);
-bool cfsrvl_ready(struct cfsrvl *service, int *err);
-
-static inline void cfsrvl_get(struct cflayer *layr)
-{
-	struct cfsrvl *s = container_of(layr, struct cfsrvl, layer);
-	if (layr == NULL || layr->up == NULL || s->hold == NULL)
-		return;
-
-	s->hold(layr->up);
-}
-
-static inline void cfsrvl_put(struct cflayer *layr)
-{
-	struct cfsrvl *s = container_of(layr, struct cfsrvl, layer);
-	if (layr == NULL || layr->up == NULL || s->hold == NULL)
-		return;
-
-	s->put(layr->up);
-}
-#endif				/* CFSRVL_H_ */
diff --git a/include/uapi/linux/caif/caif_socket.h b/include/uapi/linux/caif/caif_socket.h
deleted file mode 100644
index d9970bbaa156..000000000000
--- a/include/uapi/linux/caif/caif_socket.h
+++ /dev/null
@@ -1,195 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
-/* linux/caif_socket.h
- * CAIF Definitions for CAIF socket and network layer
- * Copyright (C) ST-Ericsson AB 2010
- * Author:	 Sjur Brendeland
- * License terms: GNU General Public License (GPL) version 2
- */
-
-#ifndef _LINUX_CAIF_SOCKET_H
-#define _LINUX_CAIF_SOCKET_H
-
-#include <linux/types.h>
-#include <linux/socket.h>
-
-/**
- * enum caif_link_selector -    Physical Link Selection.
- * @CAIF_LINK_HIGH_BANDW:	Physical interface for high-bandwidth
- *				traffic.
- * @CAIF_LINK_LOW_LATENCY:	Physical interface for low-latency
- *				traffic.
- *
- * CAIF Link Layers can register their link properties.
- * This enum is used for choosing between CAIF Link Layers when
- * setting up CAIF Channels when multiple CAIF Link Layers exists.
- */
-enum caif_link_selector {
-	CAIF_LINK_HIGH_BANDW,
-	CAIF_LINK_LOW_LATENCY
-};
-
-/**
- * enum caif_channel_priority - CAIF channel priorities.
- *
- * @CAIF_PRIO_MIN:	Min priority for a channel.
- * @CAIF_PRIO_LOW:	Low-priority channel.
- * @CAIF_PRIO_NORMAL:	Normal/default priority level.
- * @CAIF_PRIO_HIGH:	High priority level
- * @CAIF_PRIO_MAX:	Max priority for channel
- *
- * Priority can be set on CAIF Channels in order to
- * prioritize between traffic on different CAIF Channels.
- * These priority levels are recommended, but the priority value
- * is not restricted to the values defined in this enum, any value
- * between CAIF_PRIO_MIN and CAIF_PRIO_MAX could be used.
- */
-enum caif_channel_priority {
-	CAIF_PRIO_MIN	 = 0x01,
-	CAIF_PRIO_LOW	 = 0x04,
-	CAIF_PRIO_NORMAL = 0x0f,
-	CAIF_PRIO_HIGH	 = 0x14,
-	CAIF_PRIO_MAX	 = 0x1F
-};
-
-/**
- * enum caif_protocol_type  -	CAIF Channel type.
- * @CAIFPROTO_AT:		Classic AT channel.
- * @CAIFPROTO_DATAGRAM:	Datagram channel.
- * @CAIFPROTO_DATAGRAM_LOOP:	Datagram loopback channel, used for testing.
- * @CAIFPROTO_UTIL:		Utility (Psock) channel.
- * @CAIFPROTO_RFM:		Remote File Manager
- * @CAIFPROTO_DEBUG:		Debug link
- *
- * This enum defines the CAIF Channel type to be used. This defines
- * the service to connect to on the modem.
- */
-enum caif_protocol_type {
-	CAIFPROTO_AT,
-	CAIFPROTO_DATAGRAM,
-	CAIFPROTO_DATAGRAM_LOOP,
-	CAIFPROTO_UTIL,
-	CAIFPROTO_RFM,
-	CAIFPROTO_DEBUG,
-	_CAIFPROTO_MAX
-};
-#define	CAIFPROTO_MAX _CAIFPROTO_MAX
-
-/**
- * enum caif_at_type - AT Service Endpoint
- * @CAIF_ATTYPE_PLAIN:	     Connects to a plain vanilla AT channel.
- */
-enum caif_at_type {
-	CAIF_ATTYPE_PLAIN = 2
-};
- /**
- * enum caif_debug_type - Content selection for debug connection
- * @CAIF_DEBUG_TRACE_INTERACTIVE: Connection will contain
- *				both trace and interactive debug.
- * @CAIF_DEBUG_TRACE:		Connection contains trace only.
- * @CAIF_DEBUG_INTERACTIVE:	Connection to interactive debug.
- */
-enum caif_debug_type {
-	CAIF_DEBUG_TRACE_INTERACTIVE = 0,
-	CAIF_DEBUG_TRACE,
-	CAIF_DEBUG_INTERACTIVE,
-};
-
-/**
- * enum caif_debug_service - Debug Service Endpoint
- * @CAIF_RADIO_DEBUG_SERVICE:	Debug service on the Radio sub-system
- * @CAIF_APP_DEBUG_SERVICE:	Debug for the applications sub-system
- */
-enum caif_debug_service {
-	CAIF_RADIO_DEBUG_SERVICE = 1,
-	CAIF_APP_DEBUG_SERVICE
-};
-
-/**
- * struct sockaddr_caif - the sockaddr structure for CAIF sockets.
- * @family:		     Address family number, must be AF_CAIF.
- * @u:			     Union of address data 'switched' by family.
- * :
- * @u.at:                    Applies when family = CAIFPROTO_AT.
- *
- * @u.at.type:               Type of AT link to set up (enum caif_at_type).
- *
- * @u.util:                  Applies when family = CAIFPROTO_UTIL
- *
- * @u.util.service:          Utility service name.
- *
- * @u.dgm:                   Applies when family = CAIFPROTO_DATAGRAM
- *
- * @u.dgm.connection_id:     Datagram connection id.
- *
- * @u.dgm.nsapi:             NSAPI of the PDP-Context.
- *
- * @u.rfm:                   Applies when family = CAIFPROTO_RFM
- *
- * @u.rfm.connection_id:     Connection ID for RFM.
- *
- * @u.rfm.volume:            Volume to mount.
- *
- * @u.dbg:		      Applies when family = CAIFPROTO_DEBUG.
- *
- * @u.dbg.type:			     Type of debug connection to set up
- *			      (caif_debug_type).
- *
- * @u.dbg.service:	      Service sub-system to connect (caif_debug_service
- * Description:
- * This structure holds the connect parameters used for setting up a
- * CAIF Channel. It defines the service to connect to on the modem.
- */
-struct sockaddr_caif {
-	__kernel_sa_family_t  family;
-	union {
-		struct {
-			__u8  type;		/* type: enum caif_at_type */
-		} at;				/* CAIFPROTO_AT */
-		struct {
-			char	  service[16];
-		} util;				/* CAIFPROTO_UTIL */
-		union {
-			__u32 connection_id;
-			__u8  nsapi;
-		} dgm;				/* CAIFPROTO_DATAGRAM(_LOOP)*/
-		struct {
-			__u32 connection_id;
-			char	  volume[16];
-		} rfm;				/* CAIFPROTO_RFM */
-		struct {
-			__u8  type;		/* type:enum caif_debug_type */
-			__u8  service;		/* service:caif_debug_service */
-		} dbg;				/* CAIFPROTO_DEBUG */
-	} u;
-};
-
-/**
- * enum caif_socket_opts - CAIF option values for getsockopt and setsockopt.
- *
- * @CAIFSO_LINK_SELECT:		Selector used if multiple CAIF Link layers are
- *				available. Either a high bandwidth
- *				link can be selected (CAIF_LINK_HIGH_BANDW) or
- *				a low latency link (CAIF_LINK_LOW_LATENCY).
- *                              This option is of type __u32.
- *				Alternatively SO_BINDTODEVICE can be used.
- *
- * @CAIFSO_REQ_PARAM:		Used to set the request parameters for a
- *				utility channel. (maximum 256 bytes). This
- *				option must be set before connecting.
- *
- * @CAIFSO_RSP_PARAM:		Gets the response parameters for a utility
- *				channel. (maximum 256 bytes). This option
- *				is valid after a successful connect.
- *
- *
- * This enum defines the CAIF Socket options to be used on a socket
- * of type PF_CAIF.
- *
- */
-enum caif_socket_opts {
-	CAIFSO_LINK_SELECT	= 127,
-	CAIFSO_REQ_PARAM	= 128,
-	CAIFSO_RSP_PARAM	= 129,
-};
-
-#endif /* _LINUX_CAIF_SOCKET_H */
diff --git a/include/uapi/linux/caif/if_caif.h b/include/uapi/linux/caif/if_caif.h
deleted file mode 100644
index 74bca19403fa..000000000000
--- a/include/uapi/linux/caif/if_caif.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
-/*
- * Copyright (C) ST-Ericsson AB 2010
- * Author:	Sjur Brendeland
- * License terms: GNU General Public License (GPL) version 2
- */
-
-#ifndef IF_CAIF_H_
-#define IF_CAIF_H_
-#include <linux/sockios.h>
-#include <linux/types.h>
-#include <linux/socket.h>
-
-/**
- * enum ifla_caif - CAIF NetlinkRT parameters.
- * @IFLA_CAIF_IPV4_CONNID:  Connection ID for IPv4 PDP Context.
- *			    The type of attribute is NLA_U32.
- * @IFLA_CAIF_IPV6_CONNID:  Connection ID for IPv6 PDP Context.
- *			    The type of attribute is NLA_U32.
- * @IFLA_CAIF_LOOPBACK:	    If different from zero, device is doing loopback
- *			    The type of attribute is NLA_U8.
- *
- * When using RT Netlink to create, destroy or configure a CAIF IP interface,
- * enum ifla_caif is used to specify the configuration attributes.
- */
-enum ifla_caif {
-	__IFLA_CAIF_UNSPEC,
-	IFLA_CAIF_IPV4_CONNID,
-	IFLA_CAIF_IPV6_CONNID,
-	IFLA_CAIF_LOOPBACK,
-	__IFLA_CAIF_MAX
-};
-#define	IFLA_CAIF_MAX (__IFLA_CAIF_MAX-1)
-
-#endif /*IF_CAIF_H_*/