summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--zebra/if_netlink.c4
-rw-r--r--zebra/interface.c2
-rw-r--r--zebra/rt_netlink.c6
-rw-r--r--zebra/zebra_evpn_mh.c4
-rw-r--r--zebra/zebra_l2.h4
-rw-r--r--zebra/zebra_nhg.c22
-rw-r--r--zebra/zebra_vxlan.c8
-rw-r--r--zebra/zebra_vxlan_if.c24
8 files changed, 37 insertions, 37 deletions
diff --git a/zebra/if_netlink.c b/zebra/if_netlink.c
index 8b283edd50..6e5fef3b3f 100644
--- a/zebra/if_netlink.c
+++ b/zebra/if_netlink.c
@@ -749,8 +749,8 @@ static int netlink_bridge_vxlan_vlan_vni_map_update(struct interface *ifp,
memset(aftb, 0, sizeof(aftb));
netlink_parse_rtattr_nested(aftb, IFLA_BRIDGE_VLAN_TUNNEL_MAX,
i);
- if (!aftb[IFLA_BRIDGE_VLAN_TUNNEL_ID]
- || !aftb[IFLA_BRIDGE_VLAN_TUNNEL_VID])
+ if (!aftb[IFLA_BRIDGE_VLAN_TUNNEL_ID] ||
+ !aftb[IFLA_BRIDGE_VLAN_TUNNEL_VID])
/* vlan-vni info missing */
return 0;
diff --git a/zebra/interface.c b/zebra/interface.c
index 5e63a7bb5a..2e6ee65e92 100644
--- a/zebra/interface.c
+++ b/zebra/interface.c
@@ -1911,7 +1911,7 @@ static void zebra_vxlan_if_vni_hash_dump_vty(struct hash_bucket *bucket,
struct zebra_vxlan_vni *vni;
vni = (struct zebra_vxlan_vni *)bucket->data;
- vty = (struct vty *) ctxt;
+ vty = (struct vty *)ctxt;
zebra_vxlan_if_vni_dump_vty(vty, vni);
}
diff --git a/zebra/rt_netlink.c b/zebra/rt_netlink.c
index a7b462a2e2..7895c3226e 100644
--- a/zebra/rt_netlink.c
+++ b/zebra/rt_netlink.c
@@ -1333,8 +1333,8 @@ static int build_label_stack(struct mpls_label_stack *nh_label,
int num_labels = 0;
for (int i = 0; nh_label && i < nh_label->num_labels; i++) {
- if (nh_label_type != ZEBRA_LSP_EVPN
- && nh_label->label[i] == MPLS_LABEL_IMPLICIT_NULL)
+ if (nh_label_type != ZEBRA_LSP_EVPN &&
+ nh_label->label[i] == MPLS_LABEL_IMPLICIT_NULL)
continue;
if (IS_ZEBRA_DEBUG_KERNEL) {
@@ -3927,7 +3927,7 @@ int netlink_macfdb_read_mcast_for_vni(struct zebra_ns *zns,
struct interface *ifp, vni_t vni)
{
struct zebra_if *zif;
- struct ethaddr mac = { .octet = {0} };
+ struct ethaddr mac = {.octet = {0}};
struct zebra_dplane_info dp_info;
int ret = 0;
diff --git a/zebra/zebra_evpn_mh.c b/zebra/zebra_evpn_mh.c
index adb1d229c1..15def89e97 100644
--- a/zebra/zebra_evpn_mh.c
+++ b/zebra/zebra_evpn_mh.c
@@ -541,8 +541,8 @@ static bool zebra_evpn_acc_vl_cmp(const void *p1, const void *p2)
if (acc_bd1 == NULL || acc_bd2 == NULL)
return false;
- return ((acc_bd1->vid == acc_bd2->vid)
- && (acc_bd1->bridge_ifindex == acc_bd2->bridge_ifindex));
+ return ((acc_bd1->vid == acc_bd2->vid) &&
+ (acc_bd1->bridge_ifindex == acc_bd2->bridge_ifindex));
}
/* Lookup VLAN based broadcast domain */
diff --git a/zebra/zebra_l2.h b/zebra/zebra_l2.h
index 84cdf9b484..0e196a851f 100644
--- a/zebra/zebra_l2.h
+++ b/zebra/zebra_l2.h
@@ -93,14 +93,14 @@ struct zebra_l2info_gre {
};
struct zebra_vxlan_vni {
- vni_t vni; /* VNI */
+ vni_t vni; /* VNI */
vlanid_t access_vlan; /* Access VLAN - for VLAN-aware bridge. */
struct in_addr mcast_grp;
};
enum {
ZEBRA_VXLAN_IF_VNI = 0, /* per vni vxlan if */
- ZEBRA_VXLAN_IF_SVD /* single vxlan device */
+ ZEBRA_VXLAN_IF_SVD /* single vxlan device */
};
struct zebra_vxlan_if_vlan_ctx {
diff --git a/zebra/zebra_nhg.c b/zebra/zebra_nhg.c
index 194609b012..d321ab4949 100644
--- a/zebra/zebra_nhg.c
+++ b/zebra/zebra_nhg.c
@@ -2852,17 +2852,17 @@ static uint32_t nexthop_list_active_update(struct route_node *rn,
counter++;
/* Check for changes to the nexthop - set ROUTE_ENTRY_CHANGED */
- if (prev_active != new_active || prev_index != nexthop->ifindex
- || ((nexthop->type >= NEXTHOP_TYPE_IFINDEX
- && nexthop->type < NEXTHOP_TYPE_IPV6)
- && prev_src.ipv4.s_addr
- != nexthop->rmap_src.ipv4.s_addr)
- || ((nexthop->type >= NEXTHOP_TYPE_IPV6
- && nexthop->type < NEXTHOP_TYPE_BLACKHOLE)
- && !(IPV6_ADDR_SAME(&prev_src.ipv6,
- &nexthop->rmap_src.ipv6)))
- || CHECK_FLAG(re->status, ROUTE_ENTRY_LABELS_CHANGED)
- || vni_removed)
+ if (prev_active != new_active ||
+ prev_index != nexthop->ifindex ||
+ ((nexthop->type >= NEXTHOP_TYPE_IFINDEX &&
+ nexthop->type < NEXTHOP_TYPE_IPV6) &&
+ prev_src.ipv4.s_addr != nexthop->rmap_src.ipv4.s_addr) ||
+ ((nexthop->type >= NEXTHOP_TYPE_IPV6 &&
+ nexthop->type < NEXTHOP_TYPE_BLACKHOLE) &&
+ !(IPV6_ADDR_SAME(&prev_src.ipv6,
+ &nexthop->rmap_src.ipv6))) ||
+ CHECK_FLAG(re->status, ROUTE_ENTRY_LABELS_CHANGED) ||
+ vni_removed)
SET_FLAG(re->status, ROUTE_ENTRY_CHANGED);
}
diff --git a/zebra/zebra_vxlan.c b/zebra/zebra_vxlan.c
index ae80931c69..4baa3d64af 100644
--- a/zebra/zebra_vxlan.c
+++ b/zebra/zebra_vxlan.c
@@ -1050,9 +1050,9 @@ static int zevpn_build_vni_hash_table(struct zebra_if *zif,
return 0;
}
- if (zevpn->local_vtep_ip.s_addr != vxl->vtep_ip.s_addr
- || zevpn->mcast_grp.s_addr
- != vnip->mcast_grp.s_addr) {
+ if (zevpn->local_vtep_ip.s_addr !=
+ vxl->vtep_ip.s_addr ||
+ zevpn->mcast_grp.s_addr != vnip->mcast_grp.s_addr) {
zebra_vxlan_sg_deref(zevpn->local_vtep_ip,
zevpn->mcast_grp);
zebra_vxlan_sg_ref(vxl->vtep_ip,
@@ -2129,7 +2129,7 @@ static int zl3vni_from_svi_ns(struct ns *ns, void *_in_param, void **_p_zl3vni)
continue;
vni_id = zebra_vxlan_if_access_vlan_vni_find(
- zif, in_param->br_if);
+ zif, in_param->br_if);
if (vni_id) {
found = 1;
break;
diff --git a/zebra/zebra_vxlan_if.c b/zebra/zebra_vxlan_if.c
index e01d06c71a..a99a0fd1b7 100644
--- a/zebra/zebra_vxlan_if.c
+++ b/zebra/zebra_vxlan_if.c
@@ -205,14 +205,14 @@ static int zebra_vxlan_if_update_vni(struct interface *ifp,
chgflags);
/* Removed from bridge? Cleanup and return */
- if ((chgflags & ZEBRA_VXLIF_MASTER_CHANGE)
- && (zif->brslave_info.bridge_ifindex == IFINDEX_INTERNAL)) {
+ if ((chgflags & ZEBRA_VXLIF_MASTER_CHANGE) &&
+ (zif->brslave_info.bridge_ifindex == IFINDEX_INTERNAL)) {
zebra_vxlan_process_l3vni_oper_down(zl3vni);
return 0;
}
- if ((chgflags & ZEBRA_VXLIF_MASTER_MAC_CHANGE)
- && if_is_operative(ifp) && is_l3vni_oper_up(zl3vni)) {
+ if ((chgflags & ZEBRA_VXLIF_MASTER_MAC_CHANGE) &&
+ if_is_operative(ifp) && is_l3vni_oper_up(zl3vni)) {
zebra_vxlan_process_l3vni_oper_down(zl3vni);
zebra_vxlan_process_l3vni_oper_up(zl3vni);
return 0;
@@ -282,8 +282,8 @@ static int zebra_vxlan_if_update_vni(struct interface *ifp,
chgflags);
/* Removed from bridge? Cleanup and return */
- if ((chgflags & ZEBRA_VXLIF_MASTER_CHANGE)
- && (zif->brslave_info.bridge_ifindex == IFINDEX_INTERNAL)) {
+ if ((chgflags & ZEBRA_VXLIF_MASTER_CHANGE) &&
+ (zif->brslave_info.bridge_ifindex == IFINDEX_INTERNAL)) {
/* Delete from client, remove all remote VTEPs */
/* Also, free up all MACs and neighbors. */
zevpn->svi_if = NULL;
@@ -303,10 +303,10 @@ static int zebra_vxlan_if_update_vni(struct interface *ifp,
zebra_evpn_mac_del_all(zevpn, 0, 1, DEL_LOCAL_MAC);
}
- if (zevpn->local_vtep_ip.s_addr != vxl->vtep_ip.s_addr
- || zevpn->mcast_grp.s_addr != vnip->mcast_grp.s_addr) {
+ if (zevpn->local_vtep_ip.s_addr != vxl->vtep_ip.s_addr ||
+ zevpn->mcast_grp.s_addr != vnip->mcast_grp.s_addr) {
zebra_vxlan_sg_deref(zevpn->local_vtep_ip,
- zevpn->mcast_grp);
+ zevpn->mcast_grp);
zebra_vxlan_sg_ref(vxl->vtep_ip, vnip->mcast_grp);
zevpn->local_vtep_ip = vxl->vtep_ip;
zevpn->mcast_grp = vnip->mcast_grp;
@@ -425,10 +425,10 @@ static int zebra_vxlan_if_add_vni(struct interface *ifp,
if (!zevpn)
zevpn = zebra_evpn_add(vni);
- if (zevpn->local_vtep_ip.s_addr != vxl->vtep_ip.s_addr
- || zevpn->mcast_grp.s_addr != vnip->mcast_grp.s_addr) {
+ if (zevpn->local_vtep_ip.s_addr != vxl->vtep_ip.s_addr ||
+ zevpn->mcast_grp.s_addr != vnip->mcast_grp.s_addr) {
zebra_vxlan_sg_deref(zevpn->local_vtep_ip,
- zevpn->mcast_grp);
+ zevpn->mcast_grp);
zebra_vxlan_sg_ref(vxl->vtep_ip, vnip->mcast_grp);
zevpn->local_vtep_ip = vxl->vtep_ip;
zevpn->mcast_grp = vnip->mcast_grp;