diff options
author | Justin Pettit <jpettit@nicira.com> | 2011-06-09 15:43:18 -0700 |
---|---|---|
committer | Justin Pettit <jpettit@nicira.com> | 2011-06-09 16:19:38 -0700 |
commit | 6c222e55fa4222c6724094e1e7a0a69addf6b030 (patch) | |
tree | 6eba31e8d48db9b933cabb700c102883414e227e /include | |
parent | eb3e79c09d3f9fa5507d866b62d93eb09e93d4f3 (diff) |
Remove NXAST_DROP_SPOOFED_ARP action.
The NXAST_DROP_SPOOFED_ARP action has been deprecated in favor of
defining flows using the NXM_NX_ARP_SHA flow match for a while. This
commit removes it.
Signed-off-by: Justin Pettit <jpettit@nicira.com>
Acked-by: Jesse Gross <jesse@nicira.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/openflow/nicira-ext.h | 20 | ||||
-rw-r--r-- | include/openvswitch/datapath-protocol.h | 1 |
2 files changed, 1 insertions, 20 deletions
diff --git a/include/openflow/nicira-ext.h b/include/openflow/nicira-ext.h index 738fd90d..4270c165 100644 --- a/include/openflow/nicira-ext.h +++ b/include/openflow/nicira-ext.h @@ -257,7 +257,7 @@ enum nx_action_subtype { NXAST_SNAT__OBSOLETE, /* No longer used. */ NXAST_RESUBMIT, /* struct nx_action_resubmit */ NXAST_SET_TUNNEL, /* struct nx_action_set_tunnel */ - NXAST_DROP_SPOOFED_ARP, /* struct nx_action_drop_spoofed_arp */ + NXAST_DROP_SPOOFED_ARP__OBSOLETE, NXAST_SET_QUEUE, /* struct nx_action_set_queue */ NXAST_POP_QUEUE, /* struct nx_action_pop_queue */ NXAST_REG_MOVE, /* struct nx_action_reg_move */ @@ -341,24 +341,6 @@ struct nx_action_set_tunnel64 { }; OFP_ASSERT(sizeof(struct nx_action_set_tunnel64) == 24); -/* Action structure for NXAST_DROP_SPOOFED_ARP. - * - * Stops processing further actions, if the packet being processed is an - * Ethernet+IPv4 ARP packet for which the source Ethernet address inside the - * ARP packet differs from the source Ethernet address in the Ethernet header. - * - * (This action is deprecated in favor of defining flows using the - * NXM_NX_ARP_SHA flow match and will likely be removed in a future version - * of Open vSwitch.) */ -struct nx_action_drop_spoofed_arp { - ovs_be16 type; /* OFPAT_VENDOR. */ - ovs_be16 len; /* Length is 16. */ - ovs_be32 vendor; /* NX_VENDOR_ID. */ - ovs_be16 subtype; /* NXAST_DROP_SPOOFED_ARP. */ - uint8_t pad[6]; -}; -OFP_ASSERT(sizeof(struct nx_action_drop_spoofed_arp) == 16); - /* Action structure for NXAST_SET_QUEUE. * * Set the queue that should be used when packets are output. This is similar diff --git a/include/openvswitch/datapath-protocol.h b/include/openvswitch/datapath-protocol.h index e5bbc6ac..e7708ef1 100644 --- a/include/openvswitch/datapath-protocol.h +++ b/include/openvswitch/datapath-protocol.h @@ -422,7 +422,6 @@ enum odp_action_type { ODP_ACTION_ATTR_SET_TUNNEL, /* Set the encapsulating tunnel ID. */ ODP_ACTION_ATTR_SET_PRIORITY, /* Set skb->priority. */ ODP_ACTION_ATTR_POP_PRIORITY, /* Restore original skb->priority. */ - ODP_ACTION_ATTR_DROP_SPOOFED_ARP, /* Drop ARPs with spoofed source MAC. */ __ODP_ACTION_ATTR_MAX }; |