summaryrefslogtreecommitdiff
path: root/drivers/net/rtl8139.c
diff options
context:
space:
mode:
authorChris Packham <judge.packham@gmail.com>2018-11-26 21:00:29 +1300
committerJoe Hershberger <joe.hershberger@ni.com>2019-01-24 11:35:30 -0600
commit67bb984249442378ebb6a0eb68b6b0dd67dfbe72 (patch)
tree0a7d701e1fb79d59c7093d95a21d738027377e3e /drivers/net/rtl8139.c
parent1a4af5c562fdb9f5a884a53f136f2b2075ffd1d8 (diff)
net: remove CONFIG_MCAST_TFTP
No mainline board enables CONFIG_MCAST_TFTP and there have been compilation issues with the code for some time. Additionally, it has a potential buffer underrun issue (reported as a side note in CVE-2018-18439). Remove the multicast TFTP code but keep the driver API for the future addition of IPv6. Cc: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com> Signed-off-by: Chris Packham <judge.packham@gmail.com> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
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 590f8ce1542..13309970e2c 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);