diff options
| author |   Christoph Hellwig <hch@lst.de> | 2020-07-23 08:08:52 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2020-07-24 15:41:53 -0700 |
| commit | 7e4b9dbabb2ad0d108d12939e34d4d330104ac6d (patch) | |
| tree | 925846c783ed2f790ab0f1abca45611b3418c75d /net/bridge | |
| parent | net/xfrm: switch xfrm_user_policy to sockptr_t (diff) | |
| download | linux-dev-7e4b9dbabb2ad0d108d12939e34d4d330104ac6d.tar.xz linux-dev-7e4b9dbabb2ad0d108d12939e34d4d330104ac6d.zip | |
netfilter: remove the unused user argument to do_update_counters
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge')
| -rw-r--r-- | net/bridge/netfilter/ebtables.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c index fe13108af1f5..12f8929667bf 100644 --- a/net/bridge/netfilter/ebtables.c +++ b/net/bridge/netfilter/ebtables.c @@ -1242,9 +1242,8 @@ void ebt_unregister_table(struct net *net, struct ebt_table *table, /* userspace just supplied us with counters */ static int do_update_counters(struct net *net, const char *name, - struct ebt_counter __user *counters, - unsigned int num_counters, - const void __user *user, unsigned int len) + struct ebt_counter __user *counters, + unsigned int num_counters, unsigned int len) { int i, ret; struct ebt_counter *tmp; @@ -1299,7 +1298,7 @@ static int update_counters(struct net *net, const void __user *user, return -EINVAL; return do_update_counters(net, hlp.name, hlp.counters, - hlp.num_counters, user, len); + hlp.num_counters, len); } static inline int ebt_obj_to_user(char __user *um, const char *_name, @@ -2231,7 +2230,7 @@ static int compat_update_counters(struct net *net, void __user *user, return update_counters(net, user, len); return do_update_counters(net, hlp.name, compat_ptr(hlp.counters), - hlp.num_counters, user, len); + hlp.num_counters, len); } static int compat_do_ebt_get_ctl(struct sock *sk, int cmd, |