X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=lib%2Flearn.h;h=1bc00ff2ee30b12ae6395d80b23c2a37911ddc55;hb=600766e877efa2713b9c87d127f7190d8ab48da9;hp=28591727cef1ae9d4c971e683f5a4b68a89c3081;hpb=e0edde6fee279cdbbf3c179f5f50adaf0c7c7f1e;p=cascardo%2Fovs.git

diff --git a/lib/learn.h b/lib/learn.h
index 28591727c..1bc00ff2e 100644
--- a/lib/learn.h
+++ b/lib/learn.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 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,11 +17,14 @@
 #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;
 struct nx_action_learn;
 
@@ -30,11 +33,12 @@ struct nx_action_learn;
  * See include/openflow/nicira-ext.h for NXAST_LEARN specification.
  */
 
-enum ofperr learn_check(const struct nx_action_learn *, const struct flow *);
-void learn_execute(const struct nx_action_learn *, const struct flow *,
-                   struct ofputil_flow_mod *);
+enum ofperr learn_check(const struct ofpact_learn *, const struct flow *);
+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(struct ofpbuf *, char *, const struct flow *);
-void learn_format(const struct nx_action_learn *, struct ds *);
+char *learn_parse(char *, struct ofpbuf *ofpacts) OVS_WARN_UNUSED_RESULT;
+void learn_format(const struct ofpact_learn *, struct ds *);
 
 #endif /* learn.h */