The following commit has been merged in the merge/master branch: commit a26e7d8f0f9db92ac62dda5cb5c233e9b050b045 Merge: 04614cb8702d557e24f2181412abdf200d4ffe43 8771ce195840bc65854d4491d9c0720b7ea5f2a6 Author: Marek Lindner mareklindner@neomailbox.ch Date: Tue Apr 12 00:00:43 2016 +0800

Merge branch 'next'

diff --combined net/batman-adv/distributed-arp-table.c index 52c9ee2,3e6b262..4e158cc --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@@ -152,7 -152,7 +152,7 @@@ static void batadv_dat_purge(struct wor struct batadv_priv_dat *priv_dat; struct batadv_priv *bat_priv;

- delayed_work = container_of(work, struct delayed_work, work); + delayed_work = to_delayed_work(work); priv_dat = container_of(delayed_work, struct batadv_priv_dat, work); bat_priv = container_of(priv_dat, struct batadv_priv, dat);

@@@ -165,14 -165,14 +165,14 @@@ * @node: node in the local table * @data2: second object to compare the node to * - * Return: 1 if the two entries are the same, 0 otherwise. + * Return: true if the two entries are the same, false otherwise. */ -static int batadv_compare_dat(const struct hlist_node *node, const void *data2) +static bool batadv_compare_dat(const struct hlist_node *node, const void *data2) { const void *data1 = container_of(node, struct batadv_dat_entry, hash_entry);

- return memcmp(data1, data2, sizeof(__be32)) == 0 ? 1 : 0; + return memcmp(data1, data2, sizeof(__be32)) == 0; }

/** @@@ -568,6 -568,7 +568,7 @@@ static void batadv_choose_next_candidat * be sent to * @bat_priv: the bat priv with all the soft interface information * @ip_dst: ipv4 to look up in the DHT + * @vid: VLAN identifier * * An originator O is selected if and only if its DHT_ID value is one of three * closest values (from the LEFT, with wrap around if needed) then the hash @@@ -576,7 -577,8 +577,8 @@@ * Return: the candidate array of size BATADV_DAT_CANDIDATE_NUM. */ static struct batadv_dat_candidate * - batadv_dat_select_candidates(struct batadv_priv *bat_priv, __be32 ip_dst) + batadv_dat_select_candidates(struct batadv_priv *bat_priv, __be32 ip_dst, + unsigned short vid) { int select; batadv_dat_addr_t last_max = BATADV_DAT_ADDR_MAX, ip_key; @@@ -592,7 -594,7 +594,7 @@@ return NULL;

dat.ip = ip_dst; - dat.vid = 0; + dat.vid = vid; ip_key = (batadv_dat_addr_t)batadv_hash_dat(&dat, BATADV_DAT_ADDR_MAX);

@@@ -612,6 -614,7 +614,7 @@@ * @bat_priv: the bat priv with all the soft interface information * @skb: payload to send * @ip: the DHT key + * @vid: VLAN identifier * @packet_subtype: unicast4addr packet subtype to use * * This function copies the skb with pskb_copy() and is sent as unicast packet @@@ -622,7 -625,7 +625,7 @@@ */ static bool batadv_dat_send_data(struct batadv_priv *bat_priv, struct sk_buff *skb, __be32 ip, - int packet_subtype) + unsigned short vid, int packet_subtype) { int i; bool ret = false; @@@ -631,7 -634,7 +634,7 @@@ struct sk_buff *tmp_skb; struct batadv_dat_candidate *cand;

- cand = batadv_dat_select_candidates(bat_priv, ip); + cand = batadv_dat_select_candidates(bat_priv, ip, vid); if (!cand) goto out;

@@@ -717,7 -720,7 +720,7 @@@ void batadv_dat_status_update(struct ne }

/** - * batadv_gw_tvlv_ogm_handler_v1 - process incoming dat tvlv container + * batadv_dat_tvlv_ogm_handler_v1 - process incoming dat tvlv container * @bat_priv: the bat priv with all the soft interface information * @orig: the orig_node of the ogm * @flags: flags indicating the tvlv state (see batadv_tvlv_handler_flags) @@@ -1022,7 -1025,7 +1025,7 @@@ bool batadv_dat_snoop_outgoing_arp_requ ret = true; } else { /* Send the request to the DHT */ - ret = batadv_dat_send_data(bat_priv, skb, ip_dst, + ret = batadv_dat_send_data(bat_priv, skb, ip_dst, vid, BATADV_P_DAT_DHT_GET); } out: @@@ -1150,8 -1153,8 +1153,8 @@@ void batadv_dat_snoop_outgoing_arp_repl /* Send the ARP reply to the candidates for both the IP addresses that * the node obtained from the ARP reply */ - batadv_dat_send_data(bat_priv, skb, ip_src, BATADV_P_DAT_DHT_PUT); - batadv_dat_send_data(bat_priv, skb, ip_dst, BATADV_P_DAT_DHT_PUT); + batadv_dat_send_data(bat_priv, skb, ip_src, vid, BATADV_P_DAT_DHT_PUT); + batadv_dat_send_data(bat_priv, skb, ip_dst, vid, BATADV_P_DAT_DHT_PUT); }

/**