riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #14493 from miri64/netopt/cleanup/rm-LINK_CONNECTED

Browse Source 
netopt: remove deprecated alias NETOPT_LINK_CONNECTED
This commit is contained in:
Martine Lenders 2020-07-17 22:35:46 +02:00 committed by GitHub
commit e5d692babe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/enc28j60/enc28j60.c
View File

@ -505,7 +505,7 @@ static int nd_get(netdev_t *netdev, netopt_t opt, void *value, size_t max_len)
assert(max_len >= ETHERNET_ADDR_LEN); assert(max_len >= ETHERNET_ADDR_LEN);
mac_get(dev, (uint8_t *)value); mac_get(dev, (uint8_t *)value);
return ETHERNET_ADDR_LEN; return ETHERNET_ADDR_LEN;
case NETOPT_LINK_CONNECTED: case NETOPT_LINK:
if (cmd_r_phy(dev, REG_PHY_PHSTAT2) & PHSTAT2_LSTAT) { if (cmd_r_phy(dev, REG_PHY_PHSTAT2) & PHSTAT2_LSTAT) {
*((netopt_enable_t *)value) = NETOPT_ENABLE; *((netopt_enable_t *)value) = NETOPT_ENABLE;
} }

2
drivers/encx24j600/encx24j600.c
View File

@ -392,7 +392,7 @@ static int _get(netdev_t *dev, netopt_t opt, void *value, size_t max_len)
res = ETHERNET_ADDR_LEN; res = ETHERNET_ADDR_LEN;
} }
break; break;
case NETOPT_LINK_CONNECTED: case NETOPT_LINK:
{ {
encx24j600_t * encdev = (encx24j600_t *) dev; encx24j600_t * encdev = (encx24j600_t *) dev;
lock(encdev); lock(encdev);

9
sys/include/net/netopt.h
View File

@ -37,15 +37,6 @@ extern "C" {
*/ */
#define NETOPT_MAX_PACKET_SIZE NETOPT_MAX_PDU_SIZE #define NETOPT_MAX_PACKET_SIZE NETOPT_MAX_PDU_SIZE
/**
* @brief A deprecated alias for @ref NETOPT_LINK
*
* @deprecated Please use @ref NETOPT_LINK instead of
* `NETOPT_LINK_CONNECTED`. It will be removed after the
* 2020.07 release at the latest.
*/
#define NETOPT_LINK_CONNECTED NETOPT_LINK
/** /**
* @brief Global list of configuration options available throughout the * @brief Global list of configuration options available throughout the
* network stack, e.g. by netdev and netapi * network stack, e.g. by netdev and netapi