# HG changeset patch
# User Mark Haywood <Mark.Haywood@Oracle.COM>
# Date 1470582875 25200
# Node ID dc9edc6fb7736a7441f2d8cea143b425510e7899
# Parent  692ea531a2fcdf04c1b547377a62a95c91764838
23531185 Conditional MAC_OVS_AUX_DATA_VERSION code should be removed from OVS

diff -r 692ea531a2fc -r dc9edc6fb773 components/openvswitch/files/lib/dpif-solaris.c
--- a/components/openvswitch/files/lib/dpif-solaris.c	Fri Aug 05 17:24:49 2016 -0700
+++ b/components/openvswitch/files/lib/dpif-solaris.c	Sun Aug 07 08:14:35 2016 -0700
@@ -45,33 +45,6 @@
 static boolean_t	kstat2_handle_initialized = B_FALSE;
 static struct ovs_mutex	kstat_mutex = OVS_MUTEX_INITIALIZER;
 
-#ifndef  MAC_OVS_AUX_DATA_VERSION
-/* Auxillary data from OVS if it wants to send packet directly out on a port */
-typedef struct mac_ovs_aux_data_s {
-	uint16_t	moad_ofport;
-	uint16_t	moad_ofaction;
-	mactun_info_t	moad_tuninfo;
-} mac_ovs_aux_data_t;
-
-struct ovs_tpacket_auxdata {		/* tp_macoff/tp_netoff */
-	tpkt_status_t		tp_status;
-	uint32_t		tp_len;
-	uint32_t		tp_snaplen;
-	uint16_t		tp_macoff;
-	uint16_t		tp_netoff;
-	uint16_t		tp_vlan_vci;
-	mac_ovs_aux_data_t	tp_ovs_info;
-};
-
-#define	tpacket_auxdata	ovs_tpacket_auxdata
-#define	tp_of_action	tp_ovs_info.moad_ofaction
-#define	tp_of_port	tp_ovs_info.moad_ofport
-#define	tp_tun_info	tp_ovs_info.moad_tuninfo
-#define	tp_tun_type	tp_ovs_info.moad_tuninfo.mti_type
-#define	tp_tun_id	tp_ovs_info.moad_tuninfo.mti_id
-#define	tp_tun_dstip	tp_ovs_info.moad_tuninfo.mti_dst
-#endif
-
 /* Datapath interface for the openvswitch Solaris kernel module. */
 struct dpif_solaris {
 	struct dpif dpif;
@@ -1880,9 +1853,9 @@
     struct ofpbuf *packet, struct flow_tnl *tnl, bool may_steal)
 {
 	struct msghdr			msghdr;
-	struct iovec 			iov;
+	struct iovec			iov;
 	struct cmsghdr			*cmsg;
-	struct tpacket_auxdata	auxdata;
+	struct tpacket_auxdata		auxdata;
 	char coutmsg[sizeof (auxdata) + sizeof (*cmsg) + _CMSG_HDR_ALIGNMENT];
 	size_t		nwritten;
 	ssize_t		nbytes = 0;