projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ofproto: Fix type of 'out_port' parameter to query_aggregate_stats().
[openvswitch]
/
ofproto
/
ofproto-sflow.c
diff --git
a/ofproto/ofproto-sflow.c
b/ofproto/ofproto-sflow.c
index 784e5528f85472abea96585eeba427c08ff3553f..04e8347050628eb68d565c3560b79165ccc99b5c 100644
(file)
--- a/
ofproto/ofproto-sflow.c
+++ b/
ofproto/ofproto-sflow.c
@@
-34,7
+34,7
@@
#include "timeval.h"
#include "vlog.h"
#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. */
struct ofproto_sflow_port {
struct hmap_node hmap_node; /* In struct ofproto_sflow's "ports" hmap. */
@@
-182,10
+182,8
@@
sflow_agent_get_counters(void *os_, SFLPoller *poller,
counters->ifDirection = 0;
}
if (!netdev_get_flags(osp->netdev, &flags) && flags & NETDEV_UP) {
counters->ifDirection = 0;
}
if (!netdev_get_flags(osp->netdev, &flags) && flags & NETDEV_UP) {
- bool carrier;
-
counters->ifStatus = 1; /* ifAdminStatus up. */
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 {
counters->ifStatus |= 2; /* ifOperStatus us. */
}
} else {