19b6a41b6d
To add to the previous changes over the last day or so, we now are gcc6 and perl 5.24 compatible. yeah! OBS-URL: https://build.opensuse.org/request/show/399560 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=295
51 lines
1.6 KiB
Diff
51 lines
1.6 KiB
Diff
From 65b32a0b7000f70a5bb1d33190d40f9b04c93172 Mon Sep 17 00:00:00 2001
|
|
From: Michael Brown <mcb30@ipxe.org>
|
|
Date: Wed, 4 May 2016 15:53:52 +0100
|
|
Subject: [PATCH] [sis190] Fix building with GCC 6
|
|
|
|
Signed-off-by: Michael Brown <mcb30@ipxe.org>
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
|
---
|
|
src/drivers/net/sis190.c | 6 ------
|
|
src/drivers/net/sis190.h | 7 -------
|
|
2 files changed, 13 deletions(-)
|
|
|
|
diff --git a/src/drivers/net/sis190.c b/src/drivers/net/sis190.c
|
|
index 991c30f..81f3d98 100644
|
|
--- a/src/drivers/net/sis190.c
|
|
+++ b/src/drivers/net/sis190.c
|
|
@@ -72,12 +72,6 @@ struct pci_driver sis190_isa_bridge_driver __pci_driver = {
|
|
static const u32 sis190_intr_mask =
|
|
RxQEmpty | RxQInt | TxQ1Int | TxQ0Int | RxHalt | TxHalt | LinkChange;
|
|
|
|
-/*
|
|
- * Maximum number of multicast addresses to filter (vs. Rx-all-multicast).
|
|
- * The chips use a 64 element hash table based on the Ethernet CRC.
|
|
- */
|
|
-static const int multicast_filter_limit = 32;
|
|
-
|
|
static void __mdio_cmd(void *ioaddr, u32 ctl)
|
|
{
|
|
unsigned int i;
|
|
diff --git a/src/drivers/net/sis190.h b/src/drivers/net/sis190.h
|
|
index 0551333..79f94d2 100644
|
|
--- a/src/drivers/net/sis190.h
|
|
+++ b/src/drivers/net/sis190.h
|
|
@@ -297,13 +297,6 @@ static struct mii_chip_info {
|
|
{ NULL, { 0x00, 0x00 }, 0, 0 }
|
|
};
|
|
|
|
-static const struct {
|
|
- const char *name;
|
|
-} sis_chip_info[] = {
|
|
- { "SiS 190 PCI Fast Ethernet adapter" },
|
|
- { "SiS 191 PCI Gigabit Ethernet adapter" },
|
|
-};
|
|
-
|
|
static void sis190_phy_task(struct sis190_private *tp);
|
|
static void sis190_free(struct net_device *dev);
|
|
static inline void sis190_init_rxfilter(struct net_device *dev);
|
|
--
|
|
1.9.0
|
|
|