ofp-util: Also accept NXAST_DROP_SPOOFED_ARP.

[openvswitch] / datapath / flow.c

diff --git a/datapath/flow.c b/datapath/flow.c
index b80e0e295082b148085815d75e07d9c19b141491..7684c061aaaed2541ce202d60c39168837eaad7c 100644 (file)
--- a/datapath/flow.c
+++ b/datapath/flow.c
@@ -108,7 +108,10 @@ struct sw_flow_actions *flow_actions_alloc(size_t n_actions)
 {
        struct sw_flow_actions *sfa;
 
-       if (n_actions > (PAGE_SIZE - sizeof *sfa) / sizeof(union odp_action))
+       /* At least DP_MAX_PORTS actions are required to be able to flood a
+        * packet to every port.  Factor of 2 allows for setting VLAN tags,
+        * etc. */
+       if (n_actions > 2 * DP_MAX_PORTS)
                return ERR_PTR(-EINVAL);
 
        sfa = kmalloc(sizeof *sfa + n_actions * sizeof(union odp_action),
@@ -153,7 +156,7 @@ void flow_deferred_free(struct sw_flow *flow)
 /* RCU callback used by flow_deferred_free_acts. */
 static void rcu_free_acts_callback(struct rcu_head *rcu)
 {
-       struct sw_flow_actions *sf_acts = container_of(rcu, 
+       struct sw_flow_actions *sf_acts = container_of(rcu,
                        struct sw_flow_actions, rcu);
        kfree(sf_acts);
 }
@@ -346,7 +349,7 @@ int flow_extract(struct sk_buff *skb, u16 in_port, struct odp_flow_key *key)
                                key->nw_proto = ntohs(arp->ar_op);
                        }
 
-                       if (key->nw_proto == ARPOP_REQUEST 
+                       if (key->nw_proto == ARPOP_REQUEST
                                        || key->nw_proto == ARPOP_REPLY) {
                                memcpy(&key->nw_src, arp->ar_sip, sizeof(key->nw_src));
                                memcpy(&key->nw_dst, arp->ar_tip, sizeof(key->nw_dst));