diff options
| author | Tom Rini <trini@konsulko.com> | 2021-11-23 07:43:50 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-11-23 07:43:50 -0500 |
| commit | 5a24e12f13e7af70fbb7687da09f377ecbe17b84 (patch) | |
| tree | 6aeb94ed47e252474b0917a13505e1c533434629 /net | |
| parent | f9bab982ae9e459b4e64c8a4ca8569aac32bb3bf (diff) | |
| parent | f11513d9978719820998ac05ed5a5da32465f926 (diff) | |
Merge branch 'next' of https://source.denx.de/u-boot/custodians/u-boot-net into next
- Various DSA additions
- bootp: fix for VCI string
- tsec: support for promiscuous mode
- add Aspeed MDIO driver
Diffstat (limited to 'net')
| -rw-r--r-- | net/bootp.c | 2 | ||||
| -rw-r--r-- | net/dsa-uclass.c | 22 |
2 files changed, 22 insertions, 2 deletions
diff --git a/net/bootp.c b/net/bootp.c index 655b9cceb66..58e30cd6b0c 100644 --- a/net/bootp.c +++ b/net/bootp.c @@ -647,7 +647,7 @@ static int bootp_extended(u8 *e) *e++ = (576 - 312 + OPT_FIELD_SIZE) & 0xff; #endif - add_vci(e); + e = add_vci(e); #if defined(CONFIG_BOOTP_SUBNETMASK) *e++ = 1; /* Subnet mask request */ diff --git a/net/dsa-uclass.c b/net/dsa-uclass.c index bf762cd2a8c..606b1539a77 100644 --- a/net/dsa-uclass.c +++ b/net/dsa-uclass.c @@ -44,6 +44,26 @@ int dsa_set_tagging(struct udevice *dev, ushort headroom, ushort tailroom) return 0; } +ofnode dsa_port_get_ofnode(struct udevice *dev, int port) +{ + struct dsa_pdata *pdata = dev_get_uclass_plat(dev); + struct dsa_port_pdata *port_pdata; + struct udevice *pdev; + + if (port == pdata->cpu_port) + return pdata->cpu_port_node; + + for (device_find_first_child(dev, &pdev); + pdev; + device_find_next_child(&pdev)) { + port_pdata = dev_get_parent_plat(pdev); + if (port_pdata->index == port) + return dev_ofnode(pdev); + } + + return ofnode_null(); +} + /* returns the DSA master Ethernet device */ struct udevice *dsa_get_master(struct udevice *dev) { @@ -250,7 +270,7 @@ static void dsa_port_set_hwaddr(struct udevice *pdev, struct udevice *master) struct eth_ops *eth_ops = eth_get_ops(master); if (eth_ops->set_promisc) - eth_ops->set_promisc(master, 1); + eth_ops->set_promisc(master, true); return; } |