From: David S. Miller Date: Fri, 7 Oct 2011 17:38:43 +0000 (-0400) Subject: Merge branch 'master' of github.com:davem330/net X-Git-Tag: v3.2-rc1~129^2~121 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=88c5100c28b02c4b2b2c6f6fafbbd76d90f698b9;p=thirdparty%2Flinux.git Merge branch 'master' of github.com:davem330/net Conflicts: net/batman-adv/soft-interface.c --- 88c5100c28b02c4b2b2c6f6fafbbd76d90f698b9 diff --cc Documentation/networking/ip-sysctl.txt index 98c8d4229f0ae,ca5cdcd0f0e36..cb7f3148035db --- a/Documentation/networking/ip-sysctl.txt +++ b/Documentation/networking/ip-sysctl.txt @@@ -1042,14 -1042,9 +1042,14 @@@ conf/interface/* The functional behaviour for certain settings is different depending on whether local forwarding is enabled or not. - accept_ra - BOOLEAN + accept_ra - INTEGER Accept Router Advertisements; autoconfigure using them. + It also determines whether or not to transmit Router + Solicitations. If and only if the functional setting is to + accept Router Advertisements, Router Solicitations will be + transmitted. + Possible values are: 0 Do not accept Router Advertisements. 1 Accept Router Advertisements if forwarding is disabled. diff --cc net/batman-adv/soft-interface.c index aceeabc2ca86d,05dd35114a276..f9cc957289894 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@@ -596,12 -595,11 +596,12 @@@ static int interface_tx(struct sk_buff goto dropped; /* Register the client MAC in the transtable */ - tt_local_add(soft_iface, ethhdr->h_source); + tt_local_add(soft_iface, ethhdr->h_source, skb->skb_iif); - orig_node = transtable_search(bat_priv, ethhdr->h_dest); + orig_node = transtable_search(bat_priv, ethhdr->h_source, + ethhdr->h_dest); - if (is_multicast_ether_addr(ethhdr->h_dest) || - (orig_node && orig_node->gw_flags)) { + do_bcast = is_multicast_ether_addr(ethhdr->h_dest); - if (do_bcast || (orig_node && orig_node->gw_flags)) { ++ if (do_bcast || (orig_node && orig_node->gw_flags)) { ret = gw_is_target(bat_priv, skb, orig_node); if (ret < 0)