ovsdb-server: Refactoring and clean up remote status reporting.

[cascardo/ovs.git] / lib / learn.h

diff --git a/lib/learn.h b/lib/learn.h
index adf597e..1bc00ff 100644 (file)
--- a/lib/learn.h
+++ b/lib/learn.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012 Nicira, Inc.
+ * Copyright (c) 2011, 2012, 2013, 2014 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,10 +17,12 @@
 #ifndef LEARN_H
 #define LEARN_H 1
 
+#include "compiler.h"
 #include "ofp-errors.h"
 
 struct ds;
 struct flow;
+struct flow_wildcards;
 struct ofpbuf;
 struct ofpact_learn;
 struct ofputil_flow_mod;
@@ -31,15 +33,12 @@ struct nx_action_learn;
  * See include/openflow/nicira-ext.h for NXAST_LEARN specification.
  */
 
-enum ofperr learn_from_openflow(const struct nx_action_learn *,
-                                struct ofpbuf *ofpacts);
 enum ofperr learn_check(const struct ofpact_learn *, const struct flow *);
-void learn_to_nxast(const struct ofpact_learn *, struct ofpbuf *openflow);
-
 void learn_execute(const struct ofpact_learn *, const struct flow *,
                    struct ofputil_flow_mod *, struct ofpbuf *ofpacts);
+void learn_mask(const struct ofpact_learn *, struct flow_wildcards *);
 
-void learn_parse(char *, const struct flow *, struct ofpbuf *ofpacts);
+char *learn_parse(char *, struct ofpbuf *ofpacts) OVS_WARN_UNUSED_RESULT;
 void learn_format(const struct ofpact_learn *, struct ds *);
 
 #endif /* learn.h */