Merge branch 'master' of github.com:davem330/net

Conflicts:
	net/batman-adv/soft-interface.c

diff --cc Documentation/networking/ip-sysctl.txt
index 98c8d42,ca5cdcd..cb7f314
--- 1/Documentation/networking/ip-sysctl.txt
--- 2/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 MAINTAINERS
Simple merge

diff --cc drivers/net/bonding/bond_main.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h
Simple merge

diff --cc drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c
Simple merge

diff --cc drivers/net/ethernet/chelsio/cxgb3/l2t.c
Simple merge

diff --cc drivers/net/ethernet/chelsio/cxgb3/l2t.h
Simple merge

diff --cc drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
Simple merge

diff --cc drivers/net/ethernet/ibm/ibmveth.c
Simple merge

diff --cc drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
Simple merge

diff --cc drivers/net/macvlan.c
Simple merge

diff --cc drivers/net/phy/dp83640.c
Simple merge

diff --cc include/linux/pci.h
Simple merge

diff --cc net/batman-adv/soft-interface.c
index aceeabc,05dd351..f9cc957
--- 1/net/batman-adv/soft-interface.c
--- 2/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)

diff --cc net/bridge/br_device.c
Simple merge

diff --cc net/ipv4/tcp_input.c
Simple merge

diff --cc net/ipv4/tcp_ipv4.c
Simple merge

diff --cc net/ipv6/tcp_ipv6.c
Simple merge

diff --cc net/packet/af_packet.c
Simple merge