@@ -73,11 +73,10 @@ int br_mst_get_state(const struct net_device *dev, u16 msti, u8 *state)
73
73
}
74
74
EXPORT_SYMBOL_GPL (br_mst_get_state );
75
75
76
- static void br_mst_vlan_set_state (struct net_bridge_port * p , struct net_bridge_vlan * v ,
76
+ static void br_mst_vlan_set_state (struct net_bridge_vlan_group * vg ,
77
+ struct net_bridge_vlan * v ,
77
78
u8 state )
78
79
{
79
- struct net_bridge_vlan_group * vg = nbp_vlan_group (p );
80
-
81
80
if (br_vlan_get_state (v ) == state )
82
81
return ;
83
82
@@ -121,7 +120,7 @@ int br_mst_set_state(struct net_bridge_port *p, u16 msti, u8 state,
121
120
if (v -> brvlan -> msti != msti )
122
121
continue ;
123
122
124
- br_mst_vlan_set_state (p , v , state );
123
+ br_mst_vlan_set_state (vg , v , state );
125
124
}
126
125
127
126
out :
@@ -140,13 +139,13 @@ static void br_mst_vlan_sync_state(struct net_bridge_vlan *pv, u16 msti)
140
139
* it.
141
140
*/
142
141
if (v != pv && v -> brvlan -> msti == msti ) {
143
- br_mst_vlan_set_state (pv -> port , pv , v -> state );
142
+ br_mst_vlan_set_state (vg , pv , v -> state );
144
143
return ;
145
144
}
146
145
}
147
146
148
147
/* Otherwise, start out in a new MSTI with all ports disabled. */
149
- return br_mst_vlan_set_state (pv -> port , pv , BR_STATE_DISABLED );
148
+ return br_mst_vlan_set_state (vg , pv , BR_STATE_DISABLED );
150
149
}
151
150
152
151
int br_mst_vlan_set_msti (struct net_bridge_vlan * mv , u16 msti )
0 commit comments