summaryrefslogtreecommitdiff
path: root/drivers/net/rtl8139.c
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2019-01-24 15:30:06 -0500
committerTom Rini <trini@konsulko.com>2019-01-24 15:30:06 -0500
commit68489ed037530ec29fc0bc452ad6e4b0c5db02ec (patch)
treeb1fb961b98f1e9a5ab5c3f0dc80fcfc32e00e689 /drivers/net/rtl8139.c
parent0c3b301f79fcad081c8509ee4cb06e7b0478c8c1 (diff)
parent91c9cbabf935b37ab6c0b9b622e7faf0b350acb6 (diff)
downloadu-boot-68489ed037530ec29fc0bc452ad6e4b0c5db02ec.tar.gz
Merge branch 'master' of git://git.denx.de/u-boot-net
Diffstat (limited to 'drivers/net/rtl8139.c')
-rw-r--r--drivers/net/rtl8139.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/net/rtl8139.c b/drivers/net/rtl8139.c
index 590f8ce154..13309970e2 100644
--- a/drivers/net/rtl8139.c
+++ b/drivers/net/rtl8139.c
@@ -183,12 +183,10 @@ static void rtl_reset(struct eth_device *dev);
static int rtl_transmit(struct eth_device *dev, void *packet, int length);
static int rtl_poll(struct eth_device *dev);
static void rtl_disable(struct eth_device *dev);
-#ifdef CONFIG_MCAST_TFTP/* This driver already accepts all b/mcast */
-static int rtl_bcast_addr(struct eth_device *dev, const u8 *bcast_mac, u8 set)
+static int rtl_bcast_addr(struct eth_device *dev, const u8 *bcast_mac, int join)
{
return (0);
}
-#endif
static struct pci_device_id supported[] = {
{PCI_VENDOR_ID_REALTEK, PCI_DEVICE_ID_REALTEK_8139},
@@ -229,9 +227,7 @@ int rtl8139_initialize(bd_t *bis)
dev->halt = rtl_disable;
dev->send = rtl_transmit;
dev->recv = rtl_poll;
-#ifdef CONFIG_MCAST_TFTP
dev->mcast = rtl_bcast_addr;
-#endif
eth_register (dev);