From: Stephen Rothwell Date: Tue, 4 Oct 2011 02:09:58 +0000 (+1100) Subject: Merge remote-tracking branch 'net/master' X-Git-Tag: next-20111004~57 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2cc716bba79c1e7c67feae7f2eef86be0744ca80;p=karo-tx-linux.git Merge remote-tracking branch 'net/master' Conflicts: arch/powerpc/configs/40x/hcu4_defconfig drivers/s390/cio/qdio_main.c net/batman-adv/soft-interface.c --- 2cc716bba79c1e7c67feae7f2eef86be0744ca80 diff --cc Documentation/networking/ip-sysctl.txt index ca5cdcd0f0e3,98c8d4229f0a..cb7f3148035d --- a/Documentation/networking/ip-sysctl.txt +++ b/Documentation/networking/ip-sysctl.txt @@@ -1042,9 -1042,14 +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 drivers/s390/cio/qdio_main.c index a122c1c3320f,9a122280246c..7ded1b26fd25 --- a/drivers/s390/cio/qdio_main.c +++ b/drivers/s390/cio/qdio_main.c @@@ -14,6 -14,8 +14,7 @@@ #include #include #include + #include -#include #include #include #include diff --cc net/batman-adv/soft-interface.c index 05dd35114a27,aceeabc2ca86..652fb7b142a6 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@@ -595,11 -596,12 +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)) { ret = gw_is_target(bat_priv, skb, orig_node); if (ret < 0)