Skip to contentSkip to conversation

net: 802: Remove unused p8022 code

PATCH Applied [email protected] 2 participants 2 messages Apr 18, 2025 – Apr 22, 2025

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net: 802: Remove unused p8022 code

From: "Dr. David Alan Gilbert" <[email protected]>

p8022.c defines two external functions, register_8022_client() and unregister_8022_client(), the last use of which was removed in 2018 by
commit 7a2e838d28cf ("staging: ipx: delete it from the tree")

Remove the p8022.c file, it's corresponding header, and glue surrounding it. There was one place the header was included in vlan.c but it didn't use the functions it declared.

There was a comment in net/802/Makefile about checking against net/core/Makefile, but that's at least 20 years old and there's no sign of net/core/Makefile mentioning it.

---
 include/net/p8022.h | 16 ------------
 net/802/Makefile    |  5 ++--
 net/802/p8022.c     | 64 ---------------------------------------------
 net/8021q/vlan.c    |  1 -
 4 files changed, 2 insertions(+), 84 deletions(-)
 delete mode 100644 include/net/p8022.h
 delete mode 100644 net/802/p8022.c
include/net/p8022.h deleted +0 -16
deleted file mode 100644
index a29e224ac498..000000000000
@@ -1,16 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef _NET_P8022_H
-#define _NET_P8022_H
-
-struct net_device;
-struct packet_type;
-struct sk_buff;
-
-struct datalink_proto *
-register_8022_client(unsigned char type,
-		     int (*func)(struct sk_buff *skb,
-				 struct net_device *dev,
-				 struct packet_type *pt,
-				 struct net_device *orig_dev));
-void unregister_8022_client(struct datalink_proto *proto);
-#endif
net/802/Makefile +2 -3
index bfed80221b8b..99abc29d537c 100644
@@ -3,12 +3,11 @@
 # Makefile for the Linux 802.x protocol layers.
 #
 
-# Check the p8022 selections against net/core/Makefile.
-obj-$(CONFIG_LLC)	+= p8022.o psnap.o
+obj-$(CONFIG_LLC)	+= psnap.o
 obj-$(CONFIG_NET_FC)	+=                 fc.o
 obj-$(CONFIG_FDDI)	+=                 fddi.o
 obj-$(CONFIG_HIPPI)	+=                 hippi.o
-obj-$(CONFIG_ATALK)	+= p8022.o psnap.o
+obj-$(CONFIG_ATALK)	+= psnap.o
 obj-$(CONFIG_STP)	+= stp.o
 obj-$(CONFIG_GARP)	+= garp.o
 obj-$(CONFIG_MRP)	+= mrp.o
net/802/p8022.c deleted +0 -64

64 lines not on this page · raw message

net/8021q/vlan.c +0 -1
index 41be38264493..06908e37c3d9 100644
@@ -23,7 +23,6 @@
 #include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/rculist.h>
-#include <net/p8022.h>
 #include <net/arp.h>
 #include <linux/rtnetlink.h>
 #include <linux/notifier.h>
Signature · 1 line
2.49.0
#1 lore raw
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:

Hello:

This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:

Quoted 8 lines · On Fri, 18 Apr 2025 02:15:19 +0100 you wrote:

From: "Dr. David Alan Gilbert" <[email protected]>

p8022.c defines two external functions, register_8022_client() and unregister_8022_client(), the last use of which was removed in 2018 by
commit 7a2e838d28cf ("staging: ipx: delete it from the tree")

[...]

Here is the summary with links:
- [net-next] net: 802: Remove unused p8022 code

    https://git.kernel.org/netdev/net-next/c/45bd443bfd86

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html