The following commit has been merged in the merge/master branch: commit 9877f7537b379f0f795820537f9a58251a9153ce Merge: 1e1fd6f9a68b4f12981e184b5520b0e92c8a33dc 7e7fc81375bfbcf00688968a53b63f5227bfac48 Author: Antonio Quartulli ordex@autistici.org Date: Wed Apr 4 14:51:46 2012 +0200
Merge remote-tracking branch 'origin/standalone/next' into merge/master
Conflicts: net/batman-adv/README
Signed-off-by: Antonio Quartulli ordex@autistici.org
diff --combined Documentation/networking/batman-adv.txt index 4ee2f54,82c075f..82c075f --- a/Documentation/networking/batman-adv.txt +++ b/Documentation/networking/batman-adv.txt @@@ -66,10 -66,11 +66,11 @@@ All mesh wide settings can be foun folder:
# ls /sys/class/net/bat0/mesh/ - # aggregated_ogms fragmentation hop_penalty - # ap_isolation gw_bandwidth log_level - # bonding gw_mode orig_interval - # bridge_loop_avoidance gw_sel_class vis_mode + # aggregated_ogms gw_bandwidth log_level + # ap_isolation gw_mode orig_interval + # bonding gw_sel_class routing_algo + # bridge_loop_avoidance hop_penalty vis_mode + # fragmentation
There is a special folder for debugging information: diff --combined net/batman-adv/bridge_loop_avoidance.c index 8a17a78,aaa4b9f..aaa4b9f --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c @@@ -697,7 -697,8 +697,8 @@@ static int handle_unclaim(struct bat_pr return 1;
/* this must be an UNCLAIM frame */ - bat_dbg(DBG_BLA, bat_priv, "handle_unclaim(): UNCLAIM %pM on vid %d (sent by %pM)...\n", + bat_dbg(DBG_BLA, bat_priv, + "handle_unclaim(): UNCLAIM %pM on vid %d (sent by %pM)...\n", claim_addr, vid, backbone_gw->orig);
bla_del_claim(bat_priv, claim_addr, vid); diff --combined net/batman-adv/translation-table.c index 934900d,b3e608a..b3e608a --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@@ -206,6 -206,8 +206,8 @@@ void tt_local_add(struct net_device *so
if (tt_local_entry) { tt_local_entry->last_seen = jiffies; + /* possibly unset the TT_CLIENT_PENDING flag */ + tt_local_entry->common.flags &= ~TT_CLIENT_PENDING; goto out; }