Merge branch 'kconfig-symbol-clean-up-on-net'

Lukas Bulwahn says:

====================
Kconfig symbol clean-up on net

The script ./scripts/checkkconfigsymbols.py warns on invalid references to
Kconfig symbols (often, minor typos, name confusions or outdated references).

This patch series addresses all issues reported by
./scripts/checkkconfigsymbols.py in ./net/ and ./drivers/net/ for Kconfig
and Makefile files. Issues in the Kconfig and Makefile files indicate some
shortcomings in the overall build definitions, and often are true actionable
issues to address.

These issues can be identified and filtered by:

  ./scripts/checkkconfigsymbols.py \
  | grep -E "(drivers/)?net/.*(Kconfig|Makefile)" -B 1 -A 1

After applying this patch series on linux-next (next-20210811), the command
above yields no further issues to address.
====================

Link: https://lore.kernel.org/r/20210812083806.28434-1-lukas.bulwahn@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 995c613086aa322a9f9e3f77f0a22167804a803b..f37b1c56f7c43038a2b94be096a79f2ac7dd21cd 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -551,8 +551,8 @@ config VMXNET3
        tristate "VMware VMXNET3 ethernet driver"
        depends on PCI && INET
        depends on !(PAGE_SIZE_64KB || ARM64_64K_PAGES || \
-                    IA64_PAGE_SIZE_64KB || MICROBLAZE_64K_PAGES || \
-                    PARISC_PAGE_SIZE_64KB || PPC_64K_PAGES)
+                    IA64_PAGE_SIZE_64KB || PARISC_PAGE_SIZE_64KB || \
+                    PPC_64K_PAGES)
        help
          This driver supports VMware's vmxnet3 virtual ethernet NIC.
          To compile this driver as a module, choose M here: the

diff --git a/drivers/net/ethernet/freescale/dpaa/Kconfig b/drivers/net/ethernet/freescale/dpaa/Kconfig
index 626ec58a0afce4ead8c3269ede2f293d53ab36d0..0e1439fd00bd49b54e5daa0cb37a6d8b593cfbe9 100644 (file)
--- a/drivers/net/ethernet/freescale/dpaa/Kconfig
+++ b/drivers/net/ethernet/freescale/dpaa/Kconfig
@@ -4,7 +4,6 @@ menuconfig FSL_DPAA_ETH
        depends on FSL_DPAA && FSL_FMAN
        select PHYLIB
        select FIXED_PHY
-       select FSL_FMAN_MAC
        help
          Data Path Acceleration Architecture Ethernet driver,
          supporting the Freescale QorIQ chips.

diff --git a/net/802/Makefile b/net/802/Makefile
index 19406a87bdaa6033d1d34ee6e5b1bfc90d7893b5..bfed80221b8bca0c5d01e421a5668a9367c2143b 100644 (file)
--- a/net/802/Makefile
+++ b/net/802/Makefile
@@ -8,7 +8,6 @@ obj-$(CONFIG_LLC)       += p8022.o psnap.o
 obj-$(CONFIG_NET_FC)   +=                 fc.o
 obj-$(CONFIG_FDDI)     +=                 fddi.o
 obj-$(CONFIG_HIPPI)    +=                 hippi.o
-obj-$(CONFIG_IPX)      += p8022.o psnap.o p8023.o
 obj-$(CONFIG_ATALK)    += p8022.o psnap.o
 obj-$(CONFIG_STP)      += stp.o
 obj-$(CONFIG_GARP)     += garp.o

diff --git a/net/802/p8023.c b/net/802/p8023.c
deleted file mode 100644 (file)
index 19cd569..0000000
--- a/net/802/p8023.c
+++ /dev/null
@@ -1,60 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/*
- *     NET3:   802.3 data link hooks used for IPX 802.3
- *
- *     802.3 isn't really a protocol data link layer. Some old IPX stuff
- *     uses it however. Note that there is only one 802.3 protocol layer
- *     in the system. We don't currently support different protocols
- *     running raw 802.3 on different devices. Thankfully nobody else
- *     has done anything like the old IPX.
- */
-
-#include <linux/in.h>
-#include <linux/mm.h>
-#include <linux/module.h>
-#include <linux/netdevice.h>
-#include <linux/skbuff.h>
-#include <linux/slab.h>
-
-#include <net/datalink.h>
-#include <net/p8022.h>
-
-/*
- *     Place an 802.3 header on a packet. The driver will do the mac
- *     addresses, we just need to give it the buffer length.
- */
-static int p8023_request(struct datalink_proto *dl,
-                        struct sk_buff *skb, unsigned char *dest_node)
-{
-       struct net_device *dev = skb->dev;
-
-       dev_hard_header(skb, dev, ETH_P_802_3, dest_node, NULL, skb->len);
-       return dev_queue_xmit(skb);
-}
-
-/*
- *     Create an 802.3 client. Note there can be only one 802.3 client
- */
-struct datalink_proto *make_8023_client(void)
-{
-       struct datalink_proto *proto = kmalloc(sizeof(*proto), GFP_ATOMIC);
-
-       if (proto) {
-               proto->header_length = 0;
-               proto->request       = p8023_request;
-       }
-       return proto;
-}
-
-/*
- *     Destroy the 802.3 client.
- */
-void destroy_8023_client(struct datalink_proto *dl)
-{
-       kfree(dl);
-}
-
-EXPORT_SYMBOL(destroy_8023_client);
-EXPORT_SYMBOL(make_8023_client);
-
-MODULE_LICENSE("GPL");