From: David S. Miller <davem@davemloft.net>
Date: Sun, 7 Apr 2013 22:37:01 +0000 (-0400)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: v3.10-rc1~120^2~205
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=d978a6361ad13f1f9694fcb7b5852d253a544d92;p=linux.git

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

Conflicts:
	drivers/nfc/microread/mei.c
	net/netfilter/nfnetlink_queue_core.c

Pull in 'net' to get Eric Biederman's AF_UNIX fix, upon which
some cleanups are going to go on-top.

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

d978a6361ad13f1f9694fcb7b5852d253a544d92
diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
index 6cc6c6374a92,0283f343b0d1..40f58d73de78
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
@@@ -13481,17 -13437,11 +13481,11 @@@ static void bnx2x_check_kr2_wa(struct l
  {
  	struct bnx2x *bp = params->bp;
  	u16 base_page, next_page, not_kr2_device, lane;
- 	int sigdet = bnx2x_warpcore_get_sigdet(phy, params);
- 
- 	if (!sigdet) {
- 		if (!(vars->link_attr_sync & LINK_ATTR_SYNC_KR2_ENABLE))
- 			bnx2x_kr2_recovery(params, vars, phy);
- 		return;
- 	}
+ 	int sigdet;
  
  	/* Once KR2 was disabled, wait 5 seconds before checking KR2 recovery
 -	 * since some switches tend to reinit the AN process and clear the
 -	 * advertised BP/NP after ~2 seconds causing the KR2 to be disabled
 +	 * Since some switches tend to reinit the AN process and clear the
 +	 * the advertised BP/NP after ~2 seconds causing the KR2 to be disabled
  	 * and recovered many times
  	 */
  	if (vars->check_kr2_recovery_cnt > 0) {