projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ofproto: Add selective Flow Removed messages and flow deletes (OpenFlow 0.9)
[openvswitch]
/
lib
/
learning-switch.c
diff --git
a/lib/learning-switch.c
b/lib/learning-switch.c
index 78346acbb548bc5e134b6a53f9837891cf7ab221..260f5d76abd81055c2a56573a0980b5effd6e8d1 100644
(file)
--- a/
lib/learning-switch.c
+++ b/
lib/learning-switch.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2008, 2009 Nicira Networks.
+ * Copyright (c) 2008, 2009
, 2010
Nicira Networks.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-283,8
+283,8
@@
lswitch_process_packet(struct lswitch *sw, struct rconn *rconn,
process_stats_reply
},
{
process_stats_reply
},
{
- OFPT_FLOW_
EXPIR
ED,
- sizeof(struct ofp_flow_
expir
ed),
+ OFPT_FLOW_
REMOV
ED,
+ sizeof(struct ofp_flow_
remov
ed),
NULL
},
};
NULL
},
};
@@
-337,7
+337,6
@@
send_features_request(struct lswitch *sw, struct rconn *rconn)
/* Send OFPT_SET_CONFIG. */
osc = make_openflow(sizeof *osc, OFPT_SET_CONFIG, &b);
/* Send OFPT_SET_CONFIG. */
osc = make_openflow(sizeof *osc, OFPT_SET_CONFIG, &b);
- osc->flags = htons(OFPC_SEND_FLOW_EXP);
osc->miss_send_len = htons(OFP_DEFAULT_MISS_SEND_LEN);
queue_tx(sw, rconn, b);
osc->miss_send_len = htons(OFP_DEFAULT_MISS_SEND_LEN);
queue_tx(sw, rconn, b);
@@
-517,7
+516,8
@@
process_port_status(struct lswitch *sw, struct rconn *rconn, void *ops_)
}
static void
}
static void
-process_phy_port(struct lswitch *sw, struct rconn *rconn UNUSED, void *opp_)
+process_phy_port(struct lswitch *sw, struct rconn *rconn OVS_UNUSED,
+ void *opp_)
{
const struct ofp_phy_port *opp = opp_;
uint16_t port_no = ntohs(opp->port_no);
{
const struct ofp_phy_port *opp = opp_;
uint16_t port_no = ntohs(opp->port_no);