diff options
| author | Hannes Frederic Sowa <hannes@stressinduktion.org> | 2013-06-26 18:07:01 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-06-29 00:19:17 -0400 |
| commit | b173ee488dcc545e77ed482158a2f0d06d7a5860 (patch) | |
| tree | 1268f9ebef676bc7f9dddb69f923e067cbe1db26 /include/net | |
| parent | 1ec047eb4751e331bc61cff0e98f0db67db8b8dc (diff) | |
ipv6: resend MLD report if a link-local address completes DAD
RFC3590/RFC3810 specifies we should resend MLD reports as soon as a
valid link-local address is available.
We now use the valid_ll_addr_cnt to check if it is necessary to resend
a new report.
Changes since Flavio Leitner's version:
a) adapt for valid_ll_addr_cnt
b) resend first reports directly in the path and just arm the timer for
mc_qrv-1 resends.
Reported-by: Flavio Leitner <fleitner@redhat.com>
Cc: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
Cc: David Stevens <dlstevens@us.ibm.com>
Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: Flavio Leitner <fbl@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/addrconf.h | 1 | ||||
| -rw-r--r-- | include/net/if_inet6.h | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/include/net/addrconf.h b/include/net/addrconf.h index 21f702704f24..f68eaf574d7e 100644 --- a/include/net/addrconf.h +++ b/include/net/addrconf.h | |||
| @@ -155,6 +155,7 @@ extern bool ipv6_chk_mcast_addr(struct net_device *dev, | |||
| 155 | const struct in6_addr *group, | 155 | const struct in6_addr *group, |
| 156 | const struct in6_addr *src_addr); | 156 | const struct in6_addr *src_addr); |
| 157 | 157 | ||
| 158 | extern void ipv6_mc_dad_complete(struct inet6_dev *idev); | ||
| 158 | /* | 159 | /* |
| 159 | * identify MLD packets for MLD filter exceptions | 160 | * identify MLD packets for MLD filter exceptions |
| 160 | */ | 161 | */ |
diff --git a/include/net/if_inet6.h b/include/net/if_inet6.h index 1628b8f5fb26..736b5fb95474 100644 --- a/include/net/if_inet6.h +++ b/include/net/if_inet6.h | |||
| @@ -174,10 +174,12 @@ struct inet6_dev { | |||
| 174 | unsigned char mc_qrv; | 174 | unsigned char mc_qrv; |
| 175 | unsigned char mc_gq_running; | 175 | unsigned char mc_gq_running; |
| 176 | unsigned char mc_ifc_count; | 176 | unsigned char mc_ifc_count; |
| 177 | unsigned char mc_dad_count; | ||
| 177 | unsigned long mc_v1_seen; | 178 | unsigned long mc_v1_seen; |
| 178 | unsigned long mc_maxdelay; | 179 | unsigned long mc_maxdelay; |
| 179 | struct timer_list mc_gq_timer; /* general query timer */ | 180 | struct timer_list mc_gq_timer; /* general query timer */ |
| 180 | struct timer_list mc_ifc_timer; /* interface change timer */ | 181 | struct timer_list mc_ifc_timer; /* interface change timer */ |
| 182 | struct timer_list mc_dad_timer; /* dad complete mc timer */ | ||
| 181 | 183 | ||
| 182 | struct ifacaddr6 *ac_list; | 184 | struct ifacaddr6 *ac_list; |
| 183 | rwlock_t lock; | 185 | rwlock_t lock; |
