Browse Source

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: David S. Miller <davem@davemloft.net>
David S. Miller 7 years ago
parent
commit
e200f7009b
2 changed files with 1 additions and 4 deletions
  1. 0 3
      drivers/net/netdevsim/bpf.c
  2. 1 1
      drivers/net/netdevsim/netdev.c

+ 0 - 3
drivers/net/netdevsim/bpf.c

@@ -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;
 

+ 1 - 1
drivers/net/netdevsim/netdev.c

@@ -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,
 };