File ipxe.65b32a0b7000f70a5bb1d33190d40f9b04c93172.p... of Package xen

Overview Repositories Revisions Requests Users Attributes Meta

File ipxe.65b32a0b7000f70a5bb1d33190d40f9b04c93172.patch of Package xen (Revision 9c19b2ac2b72c8989bd52e3b7b9c28ae)

Currently displaying revision 9c19b2ac2b72c8989bd52e3b7b9c28ae , Show latest

From: Michael Brown <mcb30@ipxe.org>
Date: Wed, 4 May 2016 15:53:52 +0100
Subject: 65b32a0b7000f70a5bb1d33190d40f9b04c93172

[sis190] Fix building with GCC 6

Signed-off-by: Michael Brown <mcb30@ipxe.org>
---
 src/drivers/net/sis190.c | 6 ------
 src/drivers/net/sis190.h | 7 -------
 2 files changed, 13 deletions(-)

--- a/src/drivers/net/sis190.c
+++ b/src/drivers/net/sis190.c
@@ -63,30 +63,24 @@ struct pci_driver sis190_isa_bridge_driver __pci_driver = {
 	                   sizeof(sis190_isa_bridge_tbl[0])),
 	.probe		= sis190_isa_bridge_probe,
 	.remove		= sis190_isa_bridge_remove,
 };
 
 /******************************************************************************
  *********************************** </HACK> **********************************
  ******************************************************************************/
 
 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;
 
 	SIS_W32(GMIIControl, ctl);
 
 	mdelay(1);
 
 	for (i = 0; i < 100; i++) {
 		if (!(SIS_R32(GMIIControl) & EhnMIInotDone))
 			break;
 		mdelay(1);
--- a/src/drivers/net/sis190.h
+++ b/src/drivers/net/sis190.h
@@ -288,24 +288,17 @@ static struct mii_chip_info {
 	u32 feature;
 } mii_chip_table[] = {
 	{ "Atheros PHY",          { 0x004d, 0xd010 }, LAN, 0 },
 	{ "Atheros PHY AR8012",   { 0x004d, 0xd020 }, LAN, 0 },
 	{ "Broadcom PHY BCM5461", { 0x0020, 0x60c0 }, LAN, F_PHY_BCM5461 },
 	{ "Broadcom PHY AC131",   { 0x0143, 0xbc70 }, LAN, 0 },
 	{ "Agere PHY ET1101B",    { 0x0282, 0xf010 }, LAN, 0 },
 	{ "Marvell PHY 88E1111",  { 0x0141, 0x0cc0 }, LAN, F_PHY_88E1111 },
 	{ "Realtek PHY RTL8201",  { 0x0000, 0x8200 }, LAN, 0 },
 	{ 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);
 
 #endif

Places

File ipxe.65b32a0b7000f70a5bb1d33190d40f9b04c93172.patch of Package xen (Revision 9c19b2ac2b72c8989bd52e3b7b9c28ae)

Places