mir/openvswitch
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-10-19 14:37:21 +00:00
Code Issues Releases Wiki Activity

lldp: Miscellaneous coding style fixes.

Browse Source 
Signed-off-by: Ben Pfaff <blp@nicira.com>
This commit is contained in:
Ben Pfaff
2015-02-22 15:59:21 -08:00
parent 1acaf4ac8f
commit f856318e14
3 changed files with 22 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/lldp/lldp.c
View File

@@ -246,8 +246,8 @@ lldp_send(struct lldpd *global OVS_UNUSED,
/* Element type should be first 4 most significant bits, so bitwise OR
* that with the first 4 bits of the 12-bit-wide mgmt_vlan
*/
aa_element_first_byte = ((port->p_element.type & 0xF) << 4) |
((port->p_element.mgmt_vlan >> 8) & 0xF);
aa_element_first_byte = (((port->p_element.type & 0xF) << 4) |
((port->p_element.mgmt_vlan >> 8) & 0xF));
/* Second byte should just be the remaining 8 bits of .mgmt_vlan */
aa_element_second_byte = port->p_element.mgmt_vlan & 0x0FF;

10
lib/lldp/lldpd-structs.h
View File

@@ -156,13 +156,13 @@ struct lldpd_frame {
struct lldpd_hardware;
struct lldpd;
struct lldpd_ops {
int(*send)(struct lldpd *,
struct lldpd_hardware*,
int (*send)(struct lldpd *,
struct lldpd_hardware *,
char *, size_t); /* Function to send a frame */
int(*recv)(struct lldpd *,
struct lldpd_hardware*,
int (*recv)(struct lldpd *,
struct lldpd_hardware *,
int, char *, size_t); /* Function to receive a frame */
int(*cleanup)(struct lldpd *, struct lldpd_hardware *); /* Cleanup */
int (*cleanup)(struct lldpd *, struct lldpd_hardware *); /* Cleanup */
};
/* An interface is uniquely identified by h_ifindex, h_ifname and h_ops. This

16
lib/ovs-lldp.c
View File

@@ -218,14 +218,10 @@ aa_print_element_status_port(struct ds *ds, struct lldpd_hardware *hw)
chassisid_to_string((uint8_t *) &port->p_element.system_id,
sizeof port->p_element.system_id, &system);
ds_put_format(ds,
"\tAuto Attach Primary Server Id: %s\n",
id);
ds_put_format(ds,
"\tAuto Attach Primary Server Descr: %s\n",
ds_put_format(ds, "\tAuto Attach Primary Server Id: %s\n", id);
ds_put_format(ds, "\tAuto Attach Primary Server Descr: %s\n",
descr);
ds_put_format(ds,
"\tAuto Attach Primary Server System Id: %s\n",
ds_put_format(ds, "\tAuto Attach Primary Server System Id: %s\n",
system);
free(id);
@@ -405,7 +401,6 @@ update_mapping_on_lldp(struct lldp *lldp, struct lldpd_hardware *hardware,
/* TODO Should be done in the Auto Attach state machine when a mapping goes
* from "pending" to "active".
*/
{
struct bridge_aa_vlan *node = xmalloc(sizeof *node);
node->port_name = xstrdup(hardware->h_ifname);
@@ -413,7 +408,6 @@ update_mapping_on_lldp(struct lldp *lldp, struct lldpd_hardware *hardware,
node->oper = BRIDGE_AA_VLAN_OPER_ADD;
list_push_back(&lldp->active_mapping_queue, &node->list_node);
}
}
/* Bridge will poll the list of VLAN that needs to be auto configure based on
@@ -587,15 +581,13 @@ aa_mapping_unregister_mapping(struct lldp *lldp,
/* TODO Should be done in the AA SM when a mapping goes
* from "pending" to "active".
*/
{
struct bridge_aa_vlan *node = xmalloc(sizeof *node);
node->port_name = xstrdup(hw->h_ifname);
node->vlan = (uint32_t) m->vlan;
node->vlan = m->vlan;
node->oper = BRIDGE_AA_VLAN_OPER_REMOVE;
list_push_back(&lldp->active_mapping_queue, &node->list_node);
}
break;
}