#include "timeval.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(sflow)
+VLOG_DEFINE_THIS_MODULE(sflow);
struct ofproto_sflow_port {
struct hmap_node hmap_node; /* In struct ofproto_sflow's "ports" hmap. */
counters->ifDirection = 0;
}
if (!netdev_get_flags(osp->netdev, &flags) && flags & NETDEV_UP) {
- bool carrier;
-
counters->ifStatus = 1; /* ifAdminStatus up. */
- if (!netdev_get_carrier(osp->netdev, &carrier) && carrier) {
+ if (netdev_get_carrier(osp->netdev)) {
counters->ifStatus |= 2; /* ifOperStatus us. */
}
} else {
n_outputs = 0;
for (i = 0; i < n_actions; i++) {
const union odp_action *a = &actions[i];
+ uint16_t tci;
switch (a->type) {
case ODPAT_OUTPUT:
break;
case ODPAT_SET_DL_TCI:
- if (a->dl_tci.mask & htons(VLAN_VID_MASK)) {
- switchElem.flowType.sw.dst_vlan = vlan_tci_to_vid(a->dl_tci.tci);
- }
- if (a->dl_tci.mask & htons(VLAN_PCP_MASK)) {
- switchElem.flowType.sw.dst_priority = vlan_tci_to_pcp(a->dl_tci.tci);
- }
+ tci = a->dl_tci.tci;
+ switchElem.flowType.sw.dst_vlan = vlan_tci_to_vid(tci);
+ switchElem.flowType.sw.dst_priority = vlan_tci_to_pcp(tci);
break;
default: