diff options
| author |   David S. Miller <davem@davemloft.net> | 2017-12-20 12:51:11 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-12-20 12:51:11 -0500 |
| commit | e200f7009bc2011839e34489906333d0225ae46e (patch) | |
| tree | 9000c933f3a4a7e4315d0976881d1328a5eb00f3 | |
| parent | selftests: rtnetlink: add gretap test cases (diff) | |
| parent | netdevsim: bpf: remove unused variable (diff) | |
| download | linux-dev-e200f7009bc2011839e34489906333d0225ae46e.tar.xz linux-dev-e200f7009bc2011839e34489906333d0225ae46e.zip | |
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>
| -rw-r--r-- | drivers/net/netdevsim/bpf.c | 3 | ||||
| -rw-r--r-- | drivers/net/netdevsim/netdev.c | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/netdevsim/bpf.c b/drivers/net/netdevsim/bpf.c index 078d2c37a6c1..7799942ed349 100644 --- a/drivers/net/netdevsim/bpf.c +++ b/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; diff --git a/drivers/net/netdevsim/netdev.c b/drivers/net/netdevsim/netdev.c index eb8c679fca9f..92678f55ee80 100644 --- a/drivers/net/netdevsim/netdev.c +++ b/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, }; |