The following commit has been merged in the master branch: commit eac56465b88cc9ad3b964a9f0a02be3d3a136ddf Merge: 1b9c4134c126aa8ae00a57672d4a4eaecc436b54 43676ab590c3f8686fd047d34c3e33803eef71f0 Author: David S. Miller davem@davemloft.net Date: Mon Jun 20 12:59:37 2011 -0700
Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-merge
diff --combined net/batman-adv/hard-interface.c index abb4901,55b5def..db7aacf --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@@ -152,12 -152,6 +152,6 @@@ static void primary_if_select(struct ba batman_packet->ttl = TTL;
primary_if_update_addr(bat_priv); - - /*** - * hacky trick to make sure that we send the TT information via - * our new primary interface - */ - atomic_set(&bat_priv->tt_local_changed, 1); }
static bool hardif_is_iface_up(const struct hard_iface *hard_iface) @@@ -340,7 -334,8 +334,8 @@@ int hardif_enable_interface(struct hard batman_packet->flags = NO_FLAGS; batman_packet->ttl = 2; batman_packet->tq = TQ_MAX_VALUE; - batman_packet->num_tt = 0; + batman_packet->tt_num_changes = 0; + batman_packet->ttvn = 0;
hard_iface->if_num = bat_priv->num_ifaces; bat_priv->num_ifaces++; @@@ -568,7 -563,7 +563,7 @@@ static int hard_if_event(struct notifie break; default: break; - }; + }
hardif_put: hardif_free_ref(hard_iface); @@@ -659,6 -654,14 +654,14 @@@ static int batman_skb_recv(struct sk_bu case BAT_VIS: ret = recv_vis_packet(skb, hard_iface); break; + /* Translation table query (request or response) */ + case BAT_TT_QUERY: + ret = recv_tt_query(skb, hard_iface); + break; + /* Roaming advertisement */ + case BAT_ROAM_ADV: + ret = recv_roam_adv(skb, hard_iface); + break; default: ret = NET_RX_DROP; }
linux-merge@lists.open-mesh.org