eaw/u-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'network_master' of https://source.denx.de/u-boot/custodians/u-boot-net into next

Browse Source 
- Fix some non-NULL terminated strings in the networking subsystem
- net: tsec: Mark tsec_get_interface as __maybe_unused
This commit is contained in:
Tom Rini
2021-09-29 07:58:20 -04:00
parent ba17871884 4df9f5e39f
commit 6eecaf5d0f
86 changed files with 277 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/configs/ls1021atsn.h
View File

@@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0
* Copyright 2016-2019 NXP Semiconductors
* Copyright 2016-2019 NXP
* Copyright 2019 Vladimir Oltean <olteanv@gmail.com>
*/

7
include/net/dsa.h
View File

@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Copyright 2019-2021 NXP Semiconductors
* Copyright 2019-2021 NXP
*/
#ifndef __DSA_H__
@@ -57,7 +57,8 @@
/**
* struct dsa_ops - DSA operations
*
* @port_enable: Initialize a switch port for I/O.
* @port_probe: Initialize a switch port.
* @port_enable: Enable I/O for a port.
* @port_disable: Disable I/O for a port.
* @xmit: Insert the DSA tag for transmission.
* DSA drivers receive a copy of the packet with headroom and
@@ -69,6 +70,8 @@
* master including any additional headers.
*/
struct dsa_ops {
int (*port_probe)(struct udevice *dev, int port,
struct phy_device *phy);
int (*port_enable)(struct udevice *dev, int port,
struct phy_device *phy);
void (*port_disable)(struct udevice *dev, int port,

2
include/phy.h
View File

@@ -368,7 +368,7 @@ static inline int is_10g_interface(phy_interface_t interface)
{
return interface == PHY_INTERFACE_MODE_XGMII ||
interface == PHY_INTERFACE_MODE_USXGMII ||
interface == PHY_INTERFACE_MODE_XFI;
interface == PHY_INTERFACE_MODE_10GBASER;
}
#endif

4
include/phy_interface.h
View File

@@ -37,7 +37,7 @@ typedef enum {
PHY_INTERFACE_MODE_CAUI2,
PHY_INTERFACE_MODE_CAUI4,
PHY_INTERFACE_MODE_NCSI,
PHY_INTERFACE_MODE_XFI,
PHY_INTERFACE_MODE_10GBASER,
PHY_INTERFACE_MODE_USXGMII,
PHY_INTERFACE_MODE_NONE, /* Must be last */
@@ -69,7 +69,7 @@ static const char * const phy_interface_strings[] = {
[PHY_INTERFACE_MODE_CAUI2] = "caui2",
[PHY_INTERFACE_MODE_CAUI4] = "caui4",
[PHY_INTERFACE_MODE_NCSI] = "NC-SI",
[PHY_INTERFACE_MODE_XFI] = "xfi",
[PHY_INTERFACE_MODE_10GBASER] = "10gbase-r",
[PHY_INTERFACE_MODE_USXGMII] = "usxgmii",
[PHY_INTERFACE_MODE_NONE] = "",
};