svn commit: r305046 - in head/sys: dev/hyperv/netvsc dev/usb/net net

[Sepherosa Ziehau]

Author: sephe
Date: Tue Aug 30 03:11:07 2016
New Revision: 305046
URL: https://svnweb.freebsd.org/changeset/base/305046

Log:
  net/rndis: Packet types are defined by NDIS; not RNDIS specific.
  
  Reviewed by:	hps
  MFC after:	1 week
  Sponsored by:	Microsoft
  Differential Revision:	https://reviews.freebsd.org/D7681

Modified:
  head/sys/dev/hyperv/netvsc/hv_rndis.h
  head/sys/dev/usb/net/if_urndis.c
  head/sys/net/rndis.h

Modified: head/sys/dev/hyperv/netvsc/hv_rndis.h
==============================================================================
--- head/sys/dev/hyperv/netvsc/hv_rndis.h	Tue Aug 30 03:03:19 2016	(r305045)
+++ head/sys/dev/hyperv/netvsc/hv_rndis.h	Tue Aug 30 03:11:07 2016	(r305046)
@@ -889,19 +889,6 @@ typedef struct rndismp_rx_bufs_info_ {
 
 #define RNDIS_HEADER_SIZE (sizeof(rndis_msg) - sizeof(rndis_msg_container))
 
-#define NDIS_PACKET_TYPE_DIRECTED	0x00000001
-#define NDIS_PACKET_TYPE_MULTICAST	0x00000002
-#define NDIS_PACKET_TYPE_ALL_MULTICAST	0x00000004
-#define NDIS_PACKET_TYPE_BROADCAST	0x00000008
-#define NDIS_PACKET_TYPE_SOURCE_ROUTING	0x00000010
-#define NDIS_PACKET_TYPE_PROMISCUOUS	0x00000020
-#define NDIS_PACKET_TYPE_SMT		0x00000040
-#define NDIS_PACKET_TYPE_ALL_LOCAL	0x00000080
-#define NDIS_PACKET_TYPE_GROUP		0x00000100
-#define NDIS_PACKET_TYPE_ALL_FUNCTIONAL	0x00000200
-#define NDIS_PACKET_TYPE_FUNCTIONAL	0x00000400
-#define NDIS_PACKET_TYPE_MAC_FRAME	0x00000800
-
 /*
  * Externs
  */

Modified: head/sys/dev/usb/net/if_urndis.c
==============================================================================
--- head/sys/dev/usb/net/if_urndis.c	Tue Aug 30 03:03:19 2016	(r305045)
+++ head/sys/dev/usb/net/if_urndis.c	Tue Aug 30 03:11:07 2016	(r305046)
@@ -292,8 +292,8 @@ urndis_attach(device_t dev)
 	memcpy(&sc->sc_ue.ue_eaddr, buf, ETHER_ADDR_LEN);
 
 	/* Initialize packet filter */
-	sc->sc_filter = RNDIS_PACKET_TYPE_BROADCAST |
-	    RNDIS_PACKET_TYPE_ALL_MULTICAST;
+	sc->sc_filter = NDIS_PACKET_TYPE_BROADCAST |
+	    NDIS_PACKET_TYPE_ALL_MULTICAST;
 	msg.ibuf.filter = htole32(sc->sc_filter);
 	URNDIS_LOCK(sc);
 	error = urndis_ctrl_set(sc, OID_GEN_CURRENT_PACKET_FILTER,

Modified: head/sys/net/rndis.h
==============================================================================
--- head/sys/net/rndis.h	Tue Aug 30 03:03:19 2016	(r305045)
+++ head/sys/net/rndis.h	Tue Aug 30 03:11:07 2016	(r305046)
@@ -266,18 +266,18 @@ struct rndis_keepalive_comp {
 };
 
 /* packet filter bits used by OID_GEN_CURRENT_PACKET_FILTER */
-#define	RNDIS_PACKET_TYPE_DIRECTED		0x00000001
-#define	RNDIS_PACKET_TYPE_MULTICAST		0x00000002
-#define	RNDIS_PACKET_TYPE_ALL_MULTICAST		0x00000004
-#define	RNDIS_PACKET_TYPE_BROADCAST		0x00000008
-#define	RNDIS_PACKET_TYPE_SOURCE_ROUTING	0x00000010
-#define	RNDIS_PACKET_TYPE_PROMISCUOUS		0x00000020
-#define	RNDIS_PACKET_TYPE_SMT			0x00000040
-#define	RNDIS_PACKET_TYPE_ALL_LOCAL		0x00000080
-#define	RNDIS_PACKET_TYPE_GROUP			0x00001000
-#define	RNDIS_PACKET_TYPE_ALL_FUNCTIONAL	0x00002000
-#define	RNDIS_PACKET_TYPE_FUNCTIONAL		0x00004000
-#define	RNDIS_PACKET_TYPE_MAC_FRAME		0x00008000
+#define	NDIS_PACKET_TYPE_DIRECTED		0x00000001
+#define	NDIS_PACKET_TYPE_MULTICAST		0x00000002
+#define	NDIS_PACKET_TYPE_ALL_MULTICAST		0x00000004
+#define	NDIS_PACKET_TYPE_BROADCAST		0x00000008
+#define	NDIS_PACKET_TYPE_SOURCE_ROUTING		0x00000010
+#define	NDIS_PACKET_TYPE_PROMISCUOUS		0x00000020
+#define	NDIS_PACKET_TYPE_SMT			0x00000040
+#define	NDIS_PACKET_TYPE_ALL_LOCAL		0x00000080
+#define	NDIS_PACKET_TYPE_GROUP			0x00001000
+#define	NDIS_PACKET_TYPE_ALL_FUNCTIONAL		0x00002000
+#define	NDIS_PACKET_TYPE_FUNCTIONAL		0x00004000
+#define	NDIS_PACKET_TYPE_MAC_FRAME		0x00008000
 
 /* RNDIS offsets */
 #define	RNDIS_HEADER_OFFSET	8	/* bytes */