netdevsim: assume CONFIG_NET_DEVLINK is always enabled (027d4ca6) · Commits · 戴 / test

drivers/net/netdevsim/Makefile

+1 −5

Original line number	Diff line number	Diff line
		@@ -3,17 +3,13 @@
		obj-$(CONFIG_NETDEVSIM) += netdevsim.o

		netdevsim-objs := \
		netdev.o \
		netdev.o devlink.o fib.o \

		ifeq ($(CONFIG_BPF_SYSCALL),y)
		netdevsim-objs += \
		bpf.o
		endif

		ifneq ($(CONFIG_NET_DEVLINK),)
		netdevsim-objs += devlink.o fib.o
		endif

		ifneq ($(CONFIG_XFRM_OFFLOAD),)
		netdevsim-objs += ipsec.o
		endif

+0 −22

Original line number	Diff line number	Diff line
		@@ -97,9 +97,7 @@ struct netdevsim {
		bool bpf_xdpoffload_accept;

		bool bpf_map_accept;
		#if IS_ENABLED(CONFIG_NET_DEVLINK)
		struct devlink *devlink;
		#endif
		struct nsim_ipsec ipsec;
		};

		@@ -138,7 +136,6 @@ nsim_bpf_setup_tc_block_cb(enum tc_setup_type type, void *type_data,
		}
		#endif

		#if IS_ENABLED(CONFIG_NET_DEVLINK)
		enum nsim_resource_id {
		NSIM_RESOURCE_NONE, /* DEVLINK_RESOURCE_ID_PARENT_TOP */
		NSIM_RESOURCE_IPV4,
		@@ -160,25 +157,6 @@ void nsim_fib_exit(void);
		u64 nsim_fib_get_val(struct net *net, enum nsim_resource_id res_id, bool max);
		int nsim_fib_set_max(struct net *net, enum nsim_resource_id res_id, u64 val,
		struct netlink_ext_ack *extack);
		#else
		static inline int nsim_devlink_setup(struct netdevsim *ns)
		{
		return 0;
		}

		static inline void nsim_devlink_teardown(struct netdevsim *ns)
		{
		}

		static inline int nsim_devlink_init(void)
		{
		return 0;
		}

		static inline void nsim_devlink_exit(void)
		{
		}
		#endif

		#if IS_ENABLED(CONFIG_XFRM_OFFLOAD)
		void nsim_ipsec_init(struct netdevsim *ns);