kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
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>
This commit is contained in:
David S. Miller 2017-12-20 12:51:11 -05:00
commit e200f7009b
2 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/net/netdevsim/bpf.c
View file

@ -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 tc_cls_bpf_offload *cls_bpf = type_data;
struct bpf_prog *prog = cls_bpf->prog; struct bpf_prog *prog = cls_bpf->prog;
struct netdevsim *ns = cb_priv; struct netdevsim *ns = cb_priv;
bool skip_sw;
if (type != TC_SETUP_CLSBPF || if (type != TC_SETUP_CLSBPF ||
!tc_can_offload(ns->netdev) || !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) cls_bpf->common.chain_index)
return -EOPNOTSUPP; return -EOPNOTSUPP;
skip_sw = cls_bpf->gen_flags & TCA_CLS_FLAGS_SKIP_SW;
if (nsim_xdp_offload_active(ns)) if (nsim_xdp_offload_active(ns))
return -EBUSY; return -EBUSY;

2
drivers/net/netdevsim/netdev.c
View file

@ -139,7 +139,7 @@ static void nsim_dev_release(struct device *dev)
free_netdev(ns->netdev); free_netdev(ns->netdev);
} }
struct device_type nsim_dev_type = { static struct device_type nsim_dev_type = {
.groups = nsim_dev_attr_groups, .groups = nsim_dev_attr_groups,
.release = nsim_dev_release, .release = nsim_dev_release,
}; };