@@ -2404,17 +2404,17 @@ static int rocker_flow_tbl_bridge(struct rocker_port *rocker_port,
2404
2404
}
2405
2405
2406
2406
priority = ROCKER_PRIORITY_UNKNOWN ;
2407
- if (vlan_bridging & dflt & wild )
2407
+ if (vlan_bridging && dflt & & wild )
2408
2408
priority = ROCKER_PRIORITY_BRIDGING_VLAN_DFLT_WILD ;
2409
- else if (vlan_bridging & dflt & !wild )
2409
+ else if (vlan_bridging && dflt & & !wild )
2410
2410
priority = ROCKER_PRIORITY_BRIDGING_VLAN_DFLT_EXACT ;
2411
- else if (vlan_bridging & !dflt )
2411
+ else if (vlan_bridging && !dflt )
2412
2412
priority = ROCKER_PRIORITY_BRIDGING_VLAN ;
2413
- else if (!vlan_bridging & dflt & wild )
2413
+ else if (!vlan_bridging && dflt & & wild )
2414
2414
priority = ROCKER_PRIORITY_BRIDGING_TENANT_DFLT_WILD ;
2415
- else if (!vlan_bridging & dflt & !wild )
2415
+ else if (!vlan_bridging && dflt & & !wild )
2416
2416
priority = ROCKER_PRIORITY_BRIDGING_TENANT_DFLT_EXACT ;
2417
- else if (!vlan_bridging & !dflt )
2417
+ else if (!vlan_bridging && !dflt )
2418
2418
priority = ROCKER_PRIORITY_BRIDGING_TENANT ;
2419
2419
2420
2420
entry -> key .priority = priority ;
@@ -3010,9 +3010,9 @@ static void rocker_port_fdb_learn_work(struct work_struct *work)
3010
3010
bool removing = (lw -> flags & ROCKER_OP_FLAG_REMOVE );
3011
3011
bool learned = (lw -> flags & ROCKER_OP_FLAG_LEARNED );
3012
3012
3013
- if (learned & removing )
3013
+ if (learned && removing )
3014
3014
br_fdb_external_learn_del (lw -> dev , lw -> addr , lw -> vid );
3015
- else if (learned & !removing )
3015
+ else if (learned && !removing )
3016
3016
br_fdb_external_learn_add (lw -> dev , lw -> addr , lw -> vid );
3017
3017
3018
3018
kfree (work );
0 commit comments