The following commit has been merged in the master branch: commit 4bc4e64c2cfdafa6b8ecdcc5edf10cc1a147587f Merge: d2746fe5380e9af79807994756672baaf42cb130 706cc9f51d9a22528af18d4b3ffbd17b30a1d3b0 Author: David S. Miller davem@davemloft.net Date: Fri Oct 6 10:12:52 2017 -0700

Merge tag 'batadv-next-for-davem-20171006' of git://git.open-mesh.org/linux-merge

Simon Wunderlich says:

==================== This cleanup patchset includes the following patches:

- bump version strings, by Simon Wunderlich

- Cleanup patches to make checkpatch happy, by Sven Eckelmann (3 patches) ====================

Signed-off-by: David S. Miller davem@davemloft.net

diff --combined net/batman-adv/hard-interface.c index f7b413b9297e,d4aa99c060f9..4e3d5340ad96 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@@ -504,8 -504,8 +504,8 @@@ static void batadv_check_known_mac_addr

rcu_read_lock(); list_for_each_entry_rcu(hard_iface, &batadv_hardif_list, list) { - if ((hard_iface->if_status != BATADV_IF_ACTIVE) && - (hard_iface->if_status != BATADV_IF_TO_BE_ACTIVATED)) + if (hard_iface->if_status != BATADV_IF_ACTIVE && + hard_iface->if_status != BATADV_IF_TO_BE_ACTIVATED) continue;

if (hard_iface->net_dev == net_dev) @@@ -568,8 -568,8 +568,8 @@@ int batadv_hardif_min_mtu(struct net_de

rcu_read_lock(); list_for_each_entry_rcu(hard_iface, &batadv_hardif_list, list) { - if ((hard_iface->if_status != BATADV_IF_ACTIVE) && - (hard_iface->if_status != BATADV_IF_TO_BE_ACTIVATED)) + if (hard_iface->if_status != BATADV_IF_ACTIVE && + hard_iface->if_status != BATADV_IF_TO_BE_ACTIVATED) continue;

if (hard_iface->soft_iface != soft_iface) @@@ -654,8 -654,8 +654,8 @@@ out static void batadv_hardif_deactivate_interface(struct batadv_hard_iface *hard_iface) { - if ((hard_iface->if_status != BATADV_IF_ACTIVE) && - (hard_iface->if_status != BATADV_IF_TO_BE_ACTIVATED)) + if (hard_iface->if_status != BATADV_IF_ACTIVE && + hard_iface->if_status != BATADV_IF_TO_BE_ACTIVATED) return;

hard_iface->if_status = BATADV_IF_INACTIVE; @@@ -738,7 -738,7 +738,7 @@@ int batadv_hardif_enable_interface(stru bat_priv = netdev_priv(hard_iface->soft_iface);

ret = netdev_master_upper_dev_link(hard_iface->net_dev, - soft_iface, NULL, NULL); + soft_iface, NULL, NULL, NULL); if (ret) goto err_dev;

diff --combined net/batman-adv/soft-interface.c index e7d5fbb6ad53,3af4b0b29b23..543d2c3e0f0d --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@@ -69,8 -69,8 +69,8 @@@ int batadv_skb_head_push(struct sk_buf int result;

/* TODO: We must check if we can release all references to non-payload - * data using __skb_header_release in our skbs to allow skb_cow_header to - * work optimally. This means that those skbs are not allowed to read + * data using __skb_header_release in our skbs to allow skb_cow_header + * to work optimally. This means that those skbs are not allowed to read * or write any data which is before the current position of skb->data * after that call and thus allow other skbs with the same data buffer * to write freely in that area. @@@ -160,7 -160,7 +160,7 @@@ static int batadv_interface_set_mac_add static int batadv_interface_change_mtu(struct net_device *dev, int new_mtu) { /* check ranges */ - if ((new_mtu < 68) || (new_mtu > batadv_hardif_min_mtu(dev))) + if (new_mtu < 68 || new_mtu > batadv_hardif_min_mtu(dev)) return -EINVAL;

dev->mtu = new_mtu; @@@ -867,8 -867,7 +867,8 @@@ free_bat_counters * Return: 0 if successful or error otherwise. */ static int batadv_softif_slave_add(struct net_device *dev, - struct net_device *slave_dev) + struct net_device *slave_dev, + struct netlink_ext_ack *extack) { struct batadv_hard_iface *hard_iface; struct net *net = dev_net(dev);