summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorFrancois Romieu <romieu@fr.zoreil.com>2005-09-03 00:57:51 +0200
committerJeff Garzik <jgarzik@pobox.com>2005-09-06 00:06:53 +0200
commite797637f4c1cbcecb2d8f5cfa05b161da1f0b802 (patch)
treef22e5bff47b87d30af3a63b467c99521f7fe5bba /drivers/net
parent[PATCH] sis190: RGMII Tx internal delay fiddling (diff)
downloadlinux-e797637f4c1cbcecb2d8f5cfa05b161da1f0b802.tar.xz
linux-e797637f4c1cbcecb2d8f5cfa05b161da1f0b802.zip
[PATCH] sis190: basic sis191 support
The sis191 is the gigabit brother of the sis190. SiS's driver suggests that the register set is backward compatible: this should hopefully give a basic driver. The device should allow the usual features from a modern ethernet adapter (802.1q, SG, Jumbo frames, TSO, checksum offload). So far the relevant register layout is not documented. SiS's driver does not provide these features either (at least not for Linux). Signed-off-by: Francois Romieu <romieu@fr.zoreil.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/Kconfig7
-rw-r--r--drivers/net/sis190.c6
2 files changed, 8 insertions, 5 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 7d8bcb38797a..7a56556c9712 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1924,12 +1924,15 @@ config R8169_VLAN
If in doubt, say Y.
config SIS190
- tristate "SiS190 gigabit ethernet support"
+ tristate "SiS190/SiS191 gigabit ethernet support"
depends on PCI
select CRC32
select MII
---help---
- Say Y here if you have a SiS 190 PCI Gigabit Ethernet adapter.
+ Say Y here if you have a SiS 190 PCI Fast Ethernet adapter or
+ a SiS 191 PCI Gigabit Ethernet adapter. Both are expected to
+ appear in lan on motherboard designs which are based on SiS 965
+ and SiS 966 south bridge.
To compile this driver as a module, choose M here: the module
will be called sis190. This is recommended.
diff --git a/drivers/net/sis190.c b/drivers/net/sis190.c
index 61a24a944b87..92f75529eff8 100644
--- a/drivers/net/sis190.c
+++ b/drivers/net/sis190.c
@@ -331,14 +331,14 @@ static struct mii_chip_info {
const static struct {
const char *name;
- u8 version; /* depend on docs */
- u32 RxConfigMask; /* clear the bits supported by this chip */
} sis_chip_info[] = {
- { DRV_NAME, 0x00, 0xff7e1880, },
+ { "SiS 190 PCI Fast Ethernet adapter" },
+ { "SiS 191 PCI Gigabit Ethernet adapter" },
};
static struct pci_device_id sis190_pci_tbl[] __devinitdata = {
{ PCI_DEVICE(PCI_VENDOR_ID_SI, 0x0190), 0, 0, 0 },
+ { PCI_DEVICE(PCI_VENDOR_ID_SI, 0x0191), 0, 0, 1 },
{ 0, },
};