* [patch net-next 1/3] netdevsim: remove nsim_dellink() implementation
2019-04-09 15:14 [patch net-next 0/3] netdevsim: small spring cleanup Jiri Pirko
@ 2019-04-09 15:14 ` Jiri Pirko
2019-04-09 15:14 ` [patch net-next 2/3] netdevsim: let net core to free netdevsim netdev Jiri Pirko
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Jiri Pirko @ 2019-04-09 15:14 UTC (permalink / raw)
To: netdev; +Cc: davem, mlxsw, jakub.kicinski
From: Jiri Pirko <jiri@mellanox.com>
Remove nsim_dellink() implementation. The rtnetlink code sets the
dellink op to unregister_netdevice_queue(), so this is not needed.
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
---
drivers/net/netdevsim/netdev.c | 6 ------
1 file changed, 6 deletions(-)
diff --git a/drivers/net/netdevsim/netdev.c b/drivers/net/netdevsim/netdev.c
index 75a50b59cb8f..cc4a5b5793fa 100644
--- a/drivers/net/netdevsim/netdev.c
+++ b/drivers/net/netdevsim/netdev.c
@@ -544,18 +544,12 @@ static int nsim_newlink(struct net *src_net, struct net_device *dev,
return register_netdevice(dev);
}
-static void nsim_dellink(struct net_device *dev, struct list_head *head)
-{
- unregister_netdevice_queue(dev, head);
-}
-
static struct rtnl_link_ops nsim_link_ops __read_mostly = {
.kind = DRV_NAME,
.priv_size = sizeof(struct netdevsim),
.setup = nsim_setup,
.validate = nsim_validate,
.newlink = nsim_newlink,
- .dellink = nsim_dellink,
};
static int __init nsim_module_init(void)
--
2.17.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* [patch net-next 2/3] netdevsim: let net core to free netdevsim netdev
2019-04-09 15:14 [patch net-next 0/3] netdevsim: small spring cleanup Jiri Pirko
2019-04-09 15:14 ` [patch net-next 1/3] netdevsim: remove nsim_dellink() implementation Jiri Pirko
@ 2019-04-09 15:14 ` Jiri Pirko
2019-04-09 15:14 ` [patch net-next 3/3] netdevsim: assume CONFIG_NET_DEVLINK is always enabled Jiri Pirko
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Jiri Pirko @ 2019-04-09 15:14 UTC (permalink / raw)
To: netdev; +Cc: davem, mlxsw, jakub.kicinski
From: Jiri Pirko <jiri@mellanox.com>
No need to free it ourselves, just set the "needs_free_netdev" flag
and leave the work to net core.
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
---
drivers/net/netdevsim/netdev.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/netdevsim/netdev.c b/drivers/net/netdevsim/netdev.c
index cc4a5b5793fa..0af38bc6d98c 100644
--- a/drivers/net/netdevsim/netdev.c
+++ b/drivers/net/netdevsim/netdev.c
@@ -139,7 +139,6 @@ static void nsim_dev_release(struct device *dev)
struct netdevsim *ns = to_nsim(dev);
nsim_vfs_disable(ns);
- free_netdev(ns->netdev);
}
static struct device_type nsim_dev_type = {
@@ -490,6 +489,7 @@ static void nsim_setup(struct net_device *dev)
eth_hw_addr_random(dev);
dev->netdev_ops = &nsim_netdev_ops;
+ dev->needs_free_netdev = true;
dev->priv_destructor = nsim_free;
dev->tx_queue_len = 0;
--
2.17.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* [patch net-next 3/3] netdevsim: assume CONFIG_NET_DEVLINK is always enabled
2019-04-09 15:14 [patch net-next 0/3] netdevsim: small spring cleanup Jiri Pirko
2019-04-09 15:14 ` [patch net-next 1/3] netdevsim: remove nsim_dellink() implementation Jiri Pirko
2019-04-09 15:14 ` [patch net-next 2/3] netdevsim: let net core to free netdevsim netdev Jiri Pirko
@ 2019-04-09 15:14 ` Jiri Pirko
2019-04-09 16:57 ` [patch net-next 0/3] netdevsim: small spring cleanup Jakub Kicinski
2019-04-09 18:18 ` David Miller
4 siblings, 0 replies; 6+ messages in thread
From: Jiri Pirko @ 2019-04-09 15:14 UTC (permalink / raw)
To: netdev; +Cc: davem, mlxsw, jakub.kicinski
From: Jiri Pirko <jiri@mellanox.com>
Since commit f6b19b354d50 ("net: devlink: select NET_DEVLINK
from drivers") adds implicit select of NET_DEVLINK for
netdevsim, the code does not have to deal with the case
when CONFIG_NET_DEVLINK is not enabled. So remove the ifcase.
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
---
drivers/net/netdevsim/Makefile | 6 +-----
drivers/net/netdevsim/netdevsim.h | 22 ----------------------
2 files changed, 1 insertion(+), 27 deletions(-)
diff --git a/drivers/net/netdevsim/Makefile b/drivers/net/netdevsim/Makefile
index 0fee1d06c084..0e67457156eb 100644
--- a/drivers/net/netdevsim/Makefile
+++ b/drivers/net/netdevsim/Makefile
@@ -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
diff --git a/drivers/net/netdevsim/netdevsim.h b/drivers/net/netdevsim/netdevsim.h
index 384c254fafc5..f04050bcb177 100644
--- a/drivers/net/netdevsim/netdevsim.h
+++ b/drivers/net/netdevsim/netdevsim.h
@@ -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);
--
2.17.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [patch net-next 0/3] netdevsim: small spring cleanup
2019-04-09 15:14 [patch net-next 0/3] netdevsim: small spring cleanup Jiri Pirko
` (2 preceding siblings ...)
2019-04-09 15:14 ` [patch net-next 3/3] netdevsim: assume CONFIG_NET_DEVLINK is always enabled Jiri Pirko
@ 2019-04-09 16:57 ` Jakub Kicinski
2019-04-09 18:18 ` David Miller
4 siblings, 0 replies; 6+ messages in thread
From: Jakub Kicinski @ 2019-04-09 16:57 UTC (permalink / raw)
To: Jiri Pirko; +Cc: netdev, davem, mlxsw
On Tue, 9 Apr 2019 17:14:51 +0200, Jiri Pirko wrote:
> From: Jiri Pirko <jiri@mellanox.com>
>
> Nothing serious, just cosmetics.
Reviewed-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Thanks!
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [patch net-next 0/3] netdevsim: small spring cleanup
2019-04-09 15:14 [patch net-next 0/3] netdevsim: small spring cleanup Jiri Pirko
` (3 preceding siblings ...)
2019-04-09 16:57 ` [patch net-next 0/3] netdevsim: small spring cleanup Jakub Kicinski
@ 2019-04-09 18:18 ` David Miller
4 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2019-04-09 18:18 UTC (permalink / raw)
To: jiri; +Cc: netdev, mlxsw, jakub.kicinski
From: Jiri Pirko <jiri@resnulli.us>
Date: Tue, 9 Apr 2019 17:14:51 +0200
> From: Jiri Pirko <jiri@mellanox.com>
>
> Nothing serious, just cosmetics.
Series applied, thanks Jiri.
^ permalink raw reply [flat|nested] 6+ messages in thread