aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2008-11-17 17:23:26 +0000
committerImre Kaloz <kaloz@openwrt.org>2008-11-17 17:23:26 +0000
commitfbaec87e53d8073be3fab8d9dccd20ca1d5458c7 (patch)
tree746f033b9e8b29343536cabb6d7fc91f2f8fcb1d
parent7d09c0b086a3911b9577af565b13abac42c61bc3 (diff)
downloadupstream-fbaec87e53d8073be3fab8d9dccd20ca1d5458c7.tar.gz
upstream-fbaec87e53d8073be3fab8d9dccd20ca1d5458c7.tar.bz2
upstream-fbaec87e53d8073be3fab8d9dccd20ca1d5458c7.zip
resync patch
SVN-Revision: 13262
-rw-r--r--target/linux/generic-2.6/patches-2.6.27/208-rtl8110sb_fix.patch14
1 files changed, 7 insertions, 7 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.27/208-rtl8110sb_fix.patch b/target/linux/generic-2.6/patches-2.6.27/208-rtl8110sb_fix.patch
index 6f8184e68c..d3cb74fa13 100644
--- a/target/linux/generic-2.6/patches-2.6.27/208-rtl8110sb_fix.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/208-rtl8110sb_fix.patch
@@ -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;
}