Page MenuHomeFreeBSD
Files F102981047

D41628.id.diff
No OneTemporary
Actions

D41628.id.diff
View Options

diff --git a/sys/netinet/igmp.c b/sys/netinet/igmp.c
--- a/sys/netinet/igmp.c
+++ b/sys/netinet/igmp.c
@@ -2124,7 +2124,8 @@
*
* Revert to IGMPv3.
*/
- if (igi->igi_version != IGMP_VERSION_3) {
+ if (V_igmp_default_version == IGMP_VERSION_3 &&
+ igi->igi_version != IGMP_VERSION_3) {
CTR5(KTR_IGMPV3,
"%s: transition from v%d -> v%d on %p(%s)",
__func__, igi->igi_version, IGMP_VERSION_3,
@@ -2139,7 +2140,8 @@
* revert to IGMPv3.
* If IGMPv2 is enabled, revert to IGMPv2.
*/
- if (!V_igmp_v2enable) {
+ if (V_igmp_default_version == IGMP_VERSION_3 &&
+ !V_igmp_v2enable) {
CTR5(KTR_IGMPV3,
"%s: transition from v%d -> v%d on %p(%s)",
__func__, igi->igi_version, IGMP_VERSION_3,
@@ -2148,7 +2150,8 @@
igi->igi_version = IGMP_VERSION_3;
} else {
--igi->igi_v2_timer;
- if (igi->igi_version != IGMP_VERSION_2) {
+ if (V_igmp_default_version == IGMP_VERSION_2 &&
+ igi->igi_version != IGMP_VERSION_2) {
CTR5(KTR_IGMPV3,
"%s: transition from v%d -> v%d on %p(%s)",
__func__, igi->igi_version, IGMP_VERSION_2,
@@ -2166,7 +2169,8 @@
* revert to IGMPv3.
* If IGMPv1 is enabled, reset IGMPv2 timer if running.
*/
- if (!V_igmp_v1enable) {
+ if (V_igmp_default_version == IGMP_VERSION_3 &&
+ !V_igmp_v1enable) {
CTR5(KTR_IGMPV3,
"%s: transition from v%d -> v%d on %p(%s)",
__func__, igi->igi_version, IGMP_VERSION_3,

File Metadata

Mime Type
text/plain
Expires
Wed, Nov 20, 10:57 AM (5 h, 30 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
14736605
Default Alt Text
D41628.id.diff (1 KB)

Event Timeline