Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e200f700 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'netdevsim-couple-of-build-warning-fixes' 



Jakub Kicinski says:

====================
netdevsim: couple of build warning fixes

This series fixes two harmless build warning about a symbol which
should be static and an unused variable.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 5d0c138e 40946e93

drivers/net/netdevsim/bpf.c

+0 −3
Original line number Diff line number Diff line
@@ -107,7 +107,6 @@ int nsim_bpf_setup_tc_block_cb(enum tc_setup_type type, 
	struct tc_cls_bpf_offload *cls_bpf = type_data;

	struct bpf_prog *prog = cls_bpf->prog;

	struct netdevsim *ns = cb_priv;

	bool skip_sw;



	if (type != TC_SETUP_CLSBPF ||

	    !tc_can_offload(ns->netdev) ||
@@ -115,8 +114,6 @@ int nsim_bpf_setup_tc_block_cb(enum tc_setup_type type, 
	    cls_bpf->common.chain_index)

		return -EOPNOTSUPP;



	skip_sw = cls_bpf->gen_flags & TCA_CLS_FLAGS_SKIP_SW;



	if (nsim_xdp_offload_active(ns))

		return -EBUSY;

drivers/net/netdevsim/netdev.c

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ static void nsim_dev_release(struct device *dev) 
	free_netdev(ns->netdev);

}



struct device_type nsim_dev_type = {

static struct device_type nsim_dev_type = {

	.groups = nsim_dev_attr_groups,

	.release = nsim_dev_release,

};