narenas
/
opengnsys_ipxe
mirror of https://github.com/ipxe/ipxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[ipv6] Defer router discovery timeout while link is blocked 

Signed-off-by: Michael Brown <mcb30@ipxe.org>
pull/141/merge
Michael Brown 2021-01-19 14:15:56 +00:00
parent 9a341203df
commit 3a9621a6fb
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/net/ndp.c
View File

@ -46,6 +46,12 @@ FILE_LICENCE ( GPL2_OR_LATER );
/** Router discovery maximum timeout */
#define IPV6CONF_MAX_TIMEOUT ( TICKS_PER_SEC * 3 )
/** Router discovery blocked link retry timeout */
#define IPV6CONF_BLOCK_TIMEOUT ( TICKS_PER_SEC )
/** Router discovery maximum number of deferrals */
#define IPV6CONF_MAX_DEFERRALS 180
static struct ipv6conf * ipv6conf_demux ( struct net_device *netdev );
static int
ipv6conf_rx_router_advertisement ( struct net_device *netdev,
@ -1068,6 +1074,9 @@ struct ipv6conf {
/** Retransmission timer */
struct retry_timer timer;
/** Deferred discovery counter */
unsigned int deferred;
};
/** List of IPv6 configurators */
@ -1131,6 +1140,7 @@ static void ipv6conf_done ( struct ipv6conf *ipv6conf, int rc ) {
static void ipv6conf_expired ( struct retry_timer *timer, int fail ) {
struct ipv6conf *ipv6conf =
container_of ( timer, struct ipv6conf, timer );
struct net_device *netdev = ipv6conf->netdev;
/* If we have failed, terminate autoconfiguration */
if ( fail ) {
@ -1140,7 +1150,15 @@ static void ipv6conf_expired ( struct retry_timer *timer, int fail ) {
/* Otherwise, transmit router solicitation and restart timer */
start_timer ( &ipv6conf->timer );
ndp_tx_router_solicitation ( ipv6conf->netdev );
ndp_tx_router_solicitation ( netdev );
/* If link is blocked, defer router discovery timeout */
if ( netdev_link_blocked ( netdev ) &&
( ipv6conf->deferred++ <= IPV6CONF_MAX_DEFERRALS ) ) {
DBGC ( netdev, "NDP %s deferring discovery timeout\n",
netdev->name );
start_timer_fixed ( &ipv6conf->timer, IPV6CONF_BLOCK_TIMEOUT );
}
}
/**