From: David S. Miller <davem@davemloft.net>
Date: Mon, 7 Mar 2011 23:39:24 +0000 (-0800)
Subject: Merge branch 'davem-next.r8169' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ef28a4e6ecb8fbe742ea51fc9ec836b5289d1301;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'davem-next.r8169' of git://git./linux/kernel/git/romieu/netdev-2.6
---

ef28a4e6ecb8fbe742ea51fc9ec836b5289d1301
diff --cc drivers/net/r8169.c
index 7ffdb80adf40,52e20d5c8e17..5e403511289d
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@@ -3945,9 -4007,16 +4022,16 @@@ static void rtl_hw_start_8101(struct ne
  	case RTL_GIGA_MAC_VER_09:
  		rtl_hw_start_8102e_2(ioaddr, pdev);
  		break;
+ 
+ 	case RTL_GIGA_MAC_VER_29:
+ 		rtl_hw_start_8105e_1(ioaddr, pdev);
+ 		break;
+ 	case RTL_GIGA_MAC_VER_30:
+ 		rtl_hw_start_8105e_2(ioaddr, pdev);
+ 		break;
  	}
  
 -	RTL_W8(Cfg9346, Cfg9346_Unlock);
 +	RTL_W8(Cfg9346, Cfg9346_Lock);
  
  	RTL_W8(MaxTxPacketSize, TxPacketMax);