resync patch
authorImre Kaloz <kaloz@openwrt.org>
Mon, 17 Nov 2008 17:23:26 +0000 (17:23 +0000)
committerImre Kaloz <kaloz@openwrt.org>
Mon, 17 Nov 2008 17:23:26 +0000 (17:23 +0000)
SVN-Revision: 13262

target/linux/generic-2.6/patches-2.6.27/208-rtl8110sb_fix.patch

index 6f8184e..d3cb74f 100644 (file)
@@ -1,6 +1,6 @@
 --- a/drivers/net/r8169.c
 +++ b/drivers/net/r8169.c
-@@ -1519,7 +1519,7 @@ static const struct rtl_cfg_info {
+@@ -1507,7 +1507,7 @@ static const struct rtl_cfg_info {
                .hw_start       = rtl_hw_start_8169,
                .region         = 1,
                .align          = 0,
@@ -8,8 +8,8 @@
 +              .intr_event     = LinkChg | RxOverflow |
                                  RxFIFOOver | TxErr | TxOK | RxOK | RxErr,
                .napi_event     = RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow,
-               .msi            = 0
-@@ -1528,7 +1528,7 @@ static const struct rtl_cfg_info {
+               .features       = RTL_FEATURE_GMII
+@@ -1516,7 +1516,7 @@ static const struct rtl_cfg_info {
                .hw_start       = rtl_hw_start_8168,
                .region         = 2,
                .align          = 8,
@@ -17,8 +17,8 @@
 +              .intr_event     = LinkChg | RxOverflow |
                                  TxErr | TxOK | RxOK | RxErr,
                .napi_event     = TxErr | TxOK | RxOK | RxOverflow,
-               .msi            = RTL_FEATURE_MSI
-@@ -1537,7 +1537,7 @@ static const struct rtl_cfg_info {
+               .features       = RTL_FEATURE_GMII | RTL_FEATURE_MSI
+@@ -1525,7 +1525,7 @@ static const struct rtl_cfg_info {
                .hw_start       = rtl_hw_start_8101,
                .region         = 2,
                .align          = 8,
@@ -26,8 +26,8 @@
 +              .intr_event     = LinkChg | RxOverflow | PCSTimeout |
                                  RxFIFOOver | TxErr | TxOK | RxOK | RxErr,
                .napi_event     = RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow,
-               .msi            = RTL_FEATURE_MSI
-@@ -2873,10 +2873,12 @@ static irqreturn_t rtl8169_interrupt(int
+               .features       = RTL_FEATURE_MSI
+@@ -2866,10 +2866,12 @@ static irqreturn_t rtl8169_interrupt(int
                goto out;
        }