* [PATCH net-next] r8169: add D-Link DGE-560T identifiers.
@ 2012-08-29 19:40 Francois Romieu
2012-08-30 6:36 ` Ben Hutchings
0 siblings, 1 reply; 5+ messages in thread
From: Francois Romieu @ 2012-08-29 19:40 UTC (permalink / raw)
To: netdev; +Cc: David S. Miller, Neyuki Inaya
This one includes a 8168. Not to be confused with the sky2 driven
one whose PCI vendor and device ID are the same.
Reported-by: Neyuki Inaya <in@joblog.ru>
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
---
The patch applies to Linus's branch as well.
drivers/net/ethernet/realtek/r8169.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index b47d5b3..ab1cc56 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -288,6 +288,8 @@ static DEFINE_PCI_DEVICE_TABLE(rtl8169_pci_tbl) = {
{ PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8168), 0, 0, RTL_CFG_1 },
{ PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8169), 0, 0, RTL_CFG_0 },
{ PCI_DEVICE(PCI_VENDOR_ID_DLINK, 0x4300), 0, 0, RTL_CFG_0 },
+ { PCI_VENDOR_ID_DLINK, 0x4300,
+ PCI_VENDOR_ID_DLINK, 0x4b10, 0, 0, RTL_CFG_1 },
{ PCI_DEVICE(PCI_VENDOR_ID_DLINK, 0x4302), 0, 0, RTL_CFG_0 },
{ PCI_DEVICE(PCI_VENDOR_ID_AT, 0xc107), 0, 0, RTL_CFG_0 },
{ PCI_DEVICE(0x16ec, 0x0116), 0, 0, RTL_CFG_0 },
--
Ueimor
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH net-next] r8169: add D-Link DGE-560T identifiers.
2012-08-29 19:40 [PATCH net-next] r8169: add D-Link DGE-560T identifiers Francois Romieu
@ 2012-08-30 6:36 ` Ben Hutchings
2012-08-31 20:28 ` David Miller
0 siblings, 1 reply; 5+ messages in thread
From: Ben Hutchings @ 2012-08-30 6:36 UTC (permalink / raw)
To: Francois Romieu; +Cc: netdev, David S. Miller, Neyuki Inaya
On Wed, 2012-08-29 at 21:40 +0200, Francois Romieu wrote:
> This one includes a 8168. Not to be confused with the sky2 driven
> one whose PCI vendor and device ID are the same.
>
> Reported-by: Neyuki Inaya <in@joblog.ru>
> Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
> ---
>
> The patch applies to Linus's branch as well.
>
> drivers/net/ethernet/realtek/r8169.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
> index b47d5b3..ab1cc56 100644
> --- a/drivers/net/ethernet/realtek/r8169.c
> +++ b/drivers/net/ethernet/realtek/r8169.c
> @@ -288,6 +288,8 @@ static DEFINE_PCI_DEVICE_TABLE(rtl8169_pci_tbl) = {
> { PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8168), 0, 0, RTL_CFG_1 },
> { PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8169), 0, 0, RTL_CFG_0 },
> { PCI_DEVICE(PCI_VENDOR_ID_DLINK, 0x4300), 0, 0, RTL_CFG_0 },
> + { PCI_VENDOR_ID_DLINK, 0x4300,
> + PCI_VENDOR_ID_DLINK, 0x4b10, 0, 0, RTL_CFG_1 },
This has no effect, as the preceding entry will match all the same
devices. I think you need to insert it before that.
Ben.
> { PCI_DEVICE(PCI_VENDOR_ID_DLINK, 0x4302), 0, 0, RTL_CFG_0 },
> { PCI_DEVICE(PCI_VENDOR_ID_AT, 0xc107), 0, 0, RTL_CFG_0 },
> { PCI_DEVICE(0x16ec, 0x0116), 0, 0, RTL_CFG_0 },
--
Ben Hutchings, Staff Engineer, Solarflare
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH net-next] r8169: add D-Link DGE-560T identifiers.
2012-08-30 6:36 ` Ben Hutchings
@ 2012-08-31 20:28 ` David Miller
2012-08-31 21:06 ` [PATCH #2 net-next 1/1] " Francois Romieu
0 siblings, 1 reply; 5+ messages in thread
From: David Miller @ 2012-08-31 20:28 UTC (permalink / raw)
To: bhutchings; +Cc: romieu, netdev, in
From: Ben Hutchings <bhutchings@solarflare.com>
Date: Wed, 29 Aug 2012 23:36:31 -0700
> On Wed, 2012-08-29 at 21:40 +0200, Francois Romieu wrote:
>> This one includes a 8168. Not to be confused with the sky2 driven
>> one whose PCI vendor and device ID are the same.
>>
>> Reported-by: Neyuki Inaya <in@joblog.ru>
>> Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
>> ---
>>
>> The patch applies to Linus's branch as well.
>>
>> drivers/net/ethernet/realtek/r8169.c | 2 ++
>> 1 file changed, 2 insertions(+)
>>
>> diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
>> index b47d5b3..ab1cc56 100644
>> --- a/drivers/net/ethernet/realtek/r8169.c
>> +++ b/drivers/net/ethernet/realtek/r8169.c
>> @@ -288,6 +288,8 @@ static DEFINE_PCI_DEVICE_TABLE(rtl8169_pci_tbl) = {
>> { PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8168), 0, 0, RTL_CFG_1 },
>> { PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8169), 0, 0, RTL_CFG_0 },
>> { PCI_DEVICE(PCI_VENDOR_ID_DLINK, 0x4300), 0, 0, RTL_CFG_0 },
>> + { PCI_VENDOR_ID_DLINK, 0x4300,
>> + PCI_VENDOR_ID_DLINK, 0x4b10, 0, 0, RTL_CFG_1 },
>
> This has no effect, as the preceding entry will match all the same
> devices. I think you need to insert it before that.
Francois please fix up this patch, thanks.
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH #2 net-next 1/1] r8169: add D-Link DGE-560T identifiers.
2012-08-31 20:28 ` David Miller
@ 2012-08-31 21:06 ` Francois Romieu
2012-08-31 23:59 ` David Miller
0 siblings, 1 reply; 5+ messages in thread
From: Francois Romieu @ 2012-08-31 21:06 UTC (permalink / raw)
To: David Miller; +Cc: bhutchings, netdev, in
This one includes a 8168. Not to be confused with the sky2 driven
one whose PCI vendor and device ID are the same.
Reported-by: Neyuki Inaya <in@joblog.ru>
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
---
drivers/net/ethernet/realtek/r8169.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index b47d5b3..0c96604 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -287,6 +287,8 @@ static DEFINE_PCI_DEVICE_TABLE(rtl8169_pci_tbl) = {
{ PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8167), 0, 0, RTL_CFG_0 },
{ PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8168), 0, 0, RTL_CFG_1 },
{ PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8169), 0, 0, RTL_CFG_0 },
+ { PCI_VENDOR_ID_DLINK, 0x4300,
+ PCI_VENDOR_ID_DLINK, 0x4b10, 0, 0, RTL_CFG_1 },
{ PCI_DEVICE(PCI_VENDOR_ID_DLINK, 0x4300), 0, 0, RTL_CFG_0 },
{ PCI_DEVICE(PCI_VENDOR_ID_DLINK, 0x4302), 0, 0, RTL_CFG_0 },
{ PCI_DEVICE(PCI_VENDOR_ID_AT, 0xc107), 0, 0, RTL_CFG_0 },
--
Ueimor
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH #2 net-next 1/1] r8169: add D-Link DGE-560T identifiers.
2012-08-31 21:06 ` [PATCH #2 net-next 1/1] " Francois Romieu
@ 2012-08-31 23:59 ` David Miller
0 siblings, 0 replies; 5+ messages in thread
From: David Miller @ 2012-08-31 23:59 UTC (permalink / raw)
To: romieu; +Cc: bhutchings, netdev, in
From: Francois Romieu <romieu@fr.zoreil.com>
Date: Fri, 31 Aug 2012 23:06:17 +0200
> This one includes a 8168. Not to be confused with the sky2 driven
> one whose PCI vendor and device ID are the same.
>
> Reported-by: Neyuki Inaya <in@joblog.ru>
> Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Applied, thanks.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2012-08-31 23:59 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-08-29 19:40 [PATCH net-next] r8169: add D-Link DGE-560T identifiers Francois Romieu
2012-08-30 6:36 ` Ben Hutchings
2012-08-31 20:28 ` David Miller
2012-08-31 21:06 ` [PATCH #2 net-next 1/1] " Francois Romieu
2012-08-31 23:59 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.