diff options
| author | David S. Miller <davem@davemloft.net> | 2018-03-06 06:53:44 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-03-06 07:20:46 +0100 |
| commit | 0f3e9c97eb5a97972b0c0076a5cc01bb142f8e70 (patch) | |
| tree | 439c89ea3c87496c23e167148f2cdbefb6e82b30 /net/batman-adv/originator.c | |
| parent | Merge branch 'mvpp2-jumbo-frames-support' (diff) | |
| parent | Merge tag 'please-pull-ia64_misc' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| download | linux-0f3e9c97eb5a97972b0c0076a5cc01bb142f8e70.tar.xz linux-0f3e9c97eb5a97972b0c0076a5cc01bb142f8e70.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
All of the conflicts were cases of overlapping changes.
In net/core/devlink.c, we have to make care that the
resouce size_params have become a struct member rather
than a pointer to such an object.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/batman-adv/originator.c')
| -rw-r--r-- | net/batman-adv/originator.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c index 2a51a0cbb82a..716e5b43acfa 100644 --- a/net/batman-adv/originator.c +++ b/net/batman-adv/originator.c @@ -1569,7 +1569,7 @@ int batadv_orig_dump(struct sk_buff *msg, struct netlink_callback *cb) * Return: 0 on success or negative error number in case of failure */ int batadv_orig_hash_add_if(struct batadv_hard_iface *hard_iface, - int max_if_num) + unsigned int max_if_num) { struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface); struct batadv_algo_ops *bao = bat_priv->algo_ops; @@ -1611,7 +1611,7 @@ err: * Return: 0 on success or negative error number in case of failure */ int batadv_orig_hash_del_if(struct batadv_hard_iface *hard_iface, - int max_if_num) + unsigned int max_if_num) { struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface); struct batadv_hashtable *hash = bat_priv->orig_hash; |