projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
netdev-linux: Fix strict aliasing warnings.
[openvswitch]
/
ofproto
/
ofproto.h
diff --git
a/ofproto/ofproto.h
b/ofproto/ofproto.h
index fd089c5ef9690586bf8025a1d116534ae57dc413..eeaeb6f758d9f43ba9dae6a0147988258e1df3e7 100644
(file)
--- a/
ofproto/ofproto.h
+++ b/
ofproto/ofproto.h
@@
-31,7
+31,7
@@
extern "C" {
#endif
struct cls_rule;
#endif
struct cls_rule;
-struct
odp_actions
;
+struct
nlattr
;
struct ofhooks;
struct ofproto;
struct svec;
struct ofhooks;
struct ofproto;
struct svec;
@@
-136,10
+136,11
@@
void ofproto_flush_flows(struct ofproto *);
/* Hooks for ovs-vswitchd. */
struct ofhooks {
bool (*normal_cb)(const struct flow *, const struct ofpbuf *packet,
/* Hooks for ovs-vswitchd. */
struct ofhooks {
bool (*normal_cb)(const struct flow *, const struct ofpbuf *packet,
- struct o
dp_actions *
, tag_type *,
+ struct o
fpbuf *odp_actions
, tag_type *,
uint16_t *nf_output_iface, void *aux);
void (*account_flow_cb)(const struct flow *, tag_type tags,
uint16_t *nf_output_iface, void *aux);
void (*account_flow_cb)(const struct flow *, tag_type tags,
- const union odp_action *, size_t n_actions,
+ const struct nlattr *odp_actions,
+ size_t actions_len,
unsigned long long int n_bytes, void *aux);
void (*account_checkpoint_cb)(void *aux);
};
unsigned long long int n_bytes, void *aux);
void (*account_checkpoint_cb)(void *aux);
};