The following commit has been merged in the merge/master branch:
commit f917087f1bdbd432cab308736246780911dbff1b
Merge: ba4821616ed609ebfe9d9cd412abee38cc69dd93 c619e84e24748f7eefa0aa5aaf62fd8e028a827e
Author: Antonio Quartulli <antonio(a)meshcoding.com>
Date: Sat Oct 19 23:22:50 2013 +0200
Merge commit 'c619e84e24748f7eefa0aa5aaf62fd8e028a827e' into merge/master
diff --combined net/batman-adv/gateway_client.c
index 7299936,2449afa..2449afa
--- a/net/batman-adv/gateway_client.c
+++ b/net/batman-adv/gateway_client.c
@@@ -722,7 -722,7 +722,7 @@@ bool batadv_gw_is_dhcp_target(struct sk
}
/**
- * batadv_gw_out_of_range - check if the dhcp request destination the best gw
+ * batadv_gw_out_of_range - check if the dhcp request destination is the best gw
* @bat_priv: the bat priv with all the soft interface information
* @skb: the outgoing packet
*
diff --combined net/batman-adv/soft-interface.c
index a1f00e8,36f0508..36f0508
--- a/net/batman-adv/soft-interface.c
+++ b/net/batman-adv/soft-interface.c
@@@ -120,8 -120,8 +120,8 @@@ static int batadv_interface_set_mac_add
if (atomic_read(&bat_priv->mesh_state) == BATADV_MESH_ACTIVE) {
batadv_tt_local_remove(bat_priv, old_addr, BATADV_NO_FLAGS,
"mac address changed", false);
- batadv_tt_local_add(dev, addr->sa_data, BATADV_NULL_IFINDEX,
- BATADV_NO_FLAGS);
+ batadv_tt_local_add(dev, addr->sa_data, BATADV_NO_FLAGS,
+ BATADV_NULL_IFINDEX);
}
return 0;
diff --combined net/batman-adv/translation-table.c
index 5750c88,4add57d..4add57d
--- a/net/batman-adv/translation-table.c
+++ b/net/batman-adv/translation-table.c
@@@ -2181,7 -2181,7 +2181,7 @@@ static int batadv_tt_global_valid(cons
}
/**
- * batadv_tt_tvlv_generate - fill the tvlv buff it with the tt entries from the
+ * batadv_tt_tvlv_generate - fill the tvlv buff with the tt entries from the
* specified tt hash
* @bat_priv: the bat priv with all the soft interface information
* @hash: hash table containing the tt entries
@@@ -2359,7 -2359,7 +2359,7 @@@ static int batadv_send_tt_request(struc
tvlv_tt_data->num_vlan = htons(num_vlan);
/* send all the CRCs within the request. This is needed by intermediate
- * node to ensure they have the correct table before replying
+ * nodes to ensure they have the correct table before replying
*/
tt_vlan_req = (struct batadv_tvlv_tt_vlan_data *)(tvlv_tt_data + 1);
for (i = 0; i < num_vlan; i++) {
--
linux integration