1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-24 06:43:43 +02:00

resync patch

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13262 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
kaloz 2008-11-17 17:23:26 +00:00
parent b7f53dca79
commit 8e844f9619

View File

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