Fix setting "of" device name based on unitialized dp_idx.

[sliver-openvswitch.git] / datapath / forward.h

diff --git a/datapath/forward.h b/datapath/forward.h
index 90288d0..f69a8f0 100644 (file)
--- a/datapath/forward.h
+++ b/datapath/forward.h
@@ -7,7 +7,6 @@
 
 struct sk_buff;
 struct sw_chain;
-struct ofp_action;
 struct sender;
 
 /* Buffers are identified to userspace by a 31-bit opaque ID.  We divide the ID
@@ -22,20 +21,15 @@ struct sender;
 #define PKT_COOKIE_BITS (32 - PKT_BUFFER_BITS)
 
 
-void fwd_port_input(struct sw_chain *, struct sk_buff *, int in_port);
-int run_flow_through_tables(struct sw_chain *, struct sk_buff *, int in_port);
+void fwd_port_input(struct sw_chain *, struct sk_buff *,
+                   struct net_bridge_port *);
+int run_flow_through_tables(struct sw_chain *, struct sk_buff *,
+                           struct net_bridge_port *);
 int fwd_control_input(struct sw_chain *, const struct sender *,
                      const void *, size_t);
 
 uint32_t fwd_save_skb(struct sk_buff *skb);
 void fwd_discard_all(void);
-
 void fwd_exit(void);
 
-void execute_actions(struct datapath *, struct sk_buff *,
-                       const struct sw_flow_key *, 
-                       const struct ofp_action *, int n_actions);
-struct sk_buff *execute_setter(struct sk_buff *, uint16_t,
-                       const struct sw_flow_key *, const struct ofp_action *);
-
 #endif /* forward.h */