From: David S. Miller <davem@davemloft.net>
Date: Wed, 19 Feb 2014 06:24:22 +0000 (-0500)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1e8d6421cff2c24fe0b345711e7a21af02e8bcf5;p=linux-beck.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
	drivers/net/bonding/bond_3ad.h
	drivers/net/bonding/bond_main.c

Two minor conflicts in bonding, both of which were overlapping
changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

1e8d6421cff2c24fe0b345711e7a21af02e8bcf5
diff --cc drivers/net/bonding/bond_3ad.h
index 3b97fe487dca,f4dd9592ac62..bb03b1df2f3e
--- a/drivers/net/bonding/bond_3ad.h
+++ b/drivers/net/bonding/bond_3ad.h
@@@ -251,8 -251,9 +251,9 @@@ struct ad_system 
  #define SLAVE_AD_INFO(slave) ((slave)->ad_info)
  
  struct ad_bond_info {
 -	struct ad_system system;	    /* 802.3ad system structure */
 -	u32 agg_select_timer;	    // Timer to select aggregator after all adapter's hand shakes
 +	struct ad_system system;	/* 802.3ad system structure */
 +	u32 agg_select_timer;		/* Timer to select aggregator after all adapter's hand shakes */
+ 	u16 aggregator_identifier;
  };
  
  struct ad_slave_info {
diff --cc drivers/net/bonding/bond_main.c
index ac4a1b88115e,1c6104d3501d..afae7cab5cf6
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@@ -1541,12 -1547,13 +1542,13 @@@ int bond_enslave(struct net_device *bon
  		write_lock_bh(&bond->curr_slave_lock);
  		bond_select_active_slave(bond);
  		write_unlock_bh(&bond->curr_slave_lock);
+ 		unblock_netpoll_tx();
  	}
  
 -	pr_info("%s: enslaving %s as a%s interface with a%s link.\n",
 +	pr_info("%s: Enslaving %s as %s interface with %s link\n",
  		bond_dev->name, slave_dev->name,
 -		bond_is_active_slave(new_slave) ? "n active" : " backup",
 -		new_slave->link != BOND_LINK_DOWN ? "n up" : " down");
 +		bond_is_active_slave(new_slave) ? "an active" : "a backup",
 +		new_slave->link != BOND_LINK_DOWN ? "an up" : "a down");
  
  	/* enslave is successful */
  	return 0;
@@@ -2855,9 -2865,11 +2859,11 @@@ static int bond_slave_netdev_event(unsi
  			break;
  		}
  
 -		pr_info("%s: Primary slave changed to %s, reselecting active slave.\n",
 -			bond->dev->name, bond->primary_slave ? slave_dev->name :
 -							       "none");
 +		pr_info("%s: Primary slave changed to %s, reselecting active slave\n",
 +			bond->dev->name,
 +			bond->primary_slave ? slave_dev->name : "none");
+ 
+ 		block_netpoll_tx();
  		write_lock_bh(&bond->curr_slave_lock);
  		bond_select_active_slave(bond);
  		write_unlock_bh(&bond->curr_slave_lock);
diff --cc net/tipc/link.c
index e4f233d58d35,da6018beb6eb..284d6383ad6c
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
@@@ -1717,8 -1709,9 +1723,9 @@@ static void link_handle_out_of_seq_msg(
  				&l_ptr->newest_deferred_in, buf)) {
  		l_ptr->deferred_inqueue_sz++;
  		l_ptr->stats.deferred_recv++;
+ 		TIPC_SKB_CB(buf)->deferred = true;
  		if ((l_ptr->deferred_inqueue_sz % 16) == 1)
 -			tipc_link_send_proto_msg(l_ptr, STATE_MSG, 0, 0, 0, 0, 0);
 +			tipc_link_proto_xmit(l_ptr, STATE_MSG, 0, 0, 0, 0, 0);
  	} else
  		l_ptr->stats.duplicates++;
  }