From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 14 Dec 2011 02:02:10 +0000 (+1100)
Subject: Merge remote-tracking branch 'net-next/master'
X-Git-Tag: next-20111214~58
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=cef8826c48c5f581ed1215da07120b12e20751e3;p=karo-tx-linux.git

Merge remote-tracking branch 'net-next/master'

Conflicts:
	drivers/net/ethernet/freescale/fsl_pq_mdio.c
	net/batman-adv/translation-table.c
---

cef8826c48c5f581ed1215da07120b12e20751e3
diff --cc drivers/net/ethernet/freescale/fec.c
index c136230d50bb,01ee9cc417b2..4ea2bdc852f8
--- a/drivers/net/ethernet/freescale/fec.c
+++ b/drivers/net/ethernet/freescale/fec.c
@@@ -1032,10 -1040,14 +1041,14 @@@ static int fec_enet_mii_init(struct pla
  	 * mdio interface in board design, and need to be configured by
  	 * fec0 mii_bus.
  	 */
 -	if ((id_entry->driver_data & FEC_QUIRK_ENET_MAC) && pdev->id > 0) {
 +	if ((id_entry->driver_data & FEC_QUIRK_ENET_MAC) && fep->dev_id > 0) {
  		/* fec1 uses fec0 mii_bus */
- 		fep->mii_bus = fec0_mii_bus;
- 		return 0;
+ 		if (mii_cnt && fec0_mii_bus) {
+ 			fep->mii_bus = fec0_mii_bus;
+ 			mii_cnt++;
+ 			return 0;
+ 		}
+ 		return -ENOENT;
  	}
  
  	fep->mii_timeout = 0;
diff --cc net/batman-adv/translation-table.c
index 5f09a578d49d,cc87acf02431..dc0779b9e597
--- a/net/batman-adv/translation-table.c
+++ b/net/batman-adv/translation-table.c
@@@ -245,12 -242,10 +242,12 @@@ void tt_local_add(struct net_device *so
  	if (tt_global_entry) {
  		/* This node is probably going to update its tt table */
  		tt_global_entry->orig_node->tt_poss_change = true;
 -		/* The global entry has to be marked as PENDING and has to be
 +		/* The global entry has to be marked as ROAMING and has to be
  		 * kept for consistency purpose */
- 		tt_global_entry->flags |= TT_CLIENT_ROAM;
 -		tt_global_entry->common.flags |= TT_CLIENT_PENDING;
++		tt_global_entry->common.flags |= TT_CLIENT_ROAM;
 +		tt_global_entry->roam_at = jiffies;
 +
- 		send_roam_adv(bat_priv, tt_global_entry->addr,
+ 		send_roam_adv(bat_priv, tt_global_entry->common.addr,
  			      tt_global_entry->orig_node);
  	}
  out:
@@@ -704,21 -668,9 +671,21 @@@ void tt_global_del(struct bat_priv *bat
  
  	if (tt_global_entry->orig_node == orig_node) {
  		if (roaming) {
 -			tt_global_entry->common.flags |= TT_CLIENT_ROAM;
 -			tt_global_entry->roam_at = jiffies;
 -			goto out;
 +			/* if we are deleting a global entry due to a roam
 +			 * event, there are two possibilities:
 +			 * 1) the client roamed from node A to node B => we mark
 +			 *    it with TT_CLIENT_ROAM, we start a timer and we
 +			 *    wait for node B to claim it. In case of timeout
 +			 *    the entry is purged.
 +			 * 2) the client roamed to us => we can directly delete
 +			 *    the global entry, since it is useless now. */
 +			tt_local_entry = tt_local_hash_find(bat_priv,
- 							tt_global_entry->addr);
++							tt_global_entry->common.addr);
 +			if (!tt_local_entry) {
- 				tt_global_entry->flags |= TT_CLIENT_ROAM;
++				tt_global_entry->common.flags |= TT_CLIENT_ROAM;
 +				tt_global_entry->roam_at = jiffies;
 +				goto out;
 +			}
  		}
  		_tt_global_del(bat_priv, tt_global_entry, message);
  	}