d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net/rndis: Packet types are defined by NDIS; not RNDIS specific.

Browse Source 
Reviewed by:	hps
MFC after:	1 week
Sponsored by:	Microsoft
Differential Revision:	https://reviews.freebsd.org/D7681
This commit is contained in:
Sepherosa Ziehau 2016-08-30 03:11:07 +00:00
parent 77a48d6159
commit 1010113dad
3 changed files with 14 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/dev/hyperv/netvsc/hv_rndis.h
View File

@ -889,19 +889,6 @@ typedef struct rndismp_rx_bufs_info_ {
#define RNDIS_HEADER_SIZE (sizeof(rndis_msg) - sizeof(rndis_msg_container)) #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 * Externs
*/ */

4
sys/dev/usb/net/if_urndis.c
View File

@ -292,8 +292,8 @@ urndis_attach(device_t dev)
memcpy(&sc->sc_ue.ue_eaddr, buf, ETHER_ADDR_LEN); memcpy(&sc->sc_ue.ue_eaddr, buf, ETHER_ADDR_LEN);
/* Initialize packet filter */ /* Initialize packet filter */
sc->sc_filter = RNDIS_PACKET_TYPE_BROADCAST | sc->sc_filter = NDIS_PACKET_TYPE_BROADCAST |
RNDIS_PACKET_TYPE_ALL_MULTICAST; NDIS_PACKET_TYPE_ALL_MULTICAST;
msg.ibuf.filter = htole32(sc->sc_filter); msg.ibuf.filter = htole32(sc->sc_filter);
URNDIS_LOCK(sc); URNDIS_LOCK(sc);
error = urndis_ctrl_set(sc, OID_GEN_CURRENT_PACKET_FILTER, error = urndis_ctrl_set(sc, OID_GEN_CURRENT_PACKET_FILTER,

24
sys/net/rndis.h
View File

@ -266,18 +266,18 @@ struct rndis_keepalive_comp {
}; };
/* packet filter bits used by OID_GEN_CURRENT_PACKET_FILTER */ /* packet filter bits used by OID_GEN_CURRENT_PACKET_FILTER */
#define RNDIS_PACKET_TYPE_DIRECTED 0x00000001 #define NDIS_PACKET_TYPE_DIRECTED 0x00000001
#define RNDIS_PACKET_TYPE_MULTICAST 0x00000002 #define NDIS_PACKET_TYPE_MULTICAST 0x00000002
#define RNDIS_PACKET_TYPE_ALL_MULTICAST 0x00000004 #define NDIS_PACKET_TYPE_ALL_MULTICAST 0x00000004
#define RNDIS_PACKET_TYPE_BROADCAST 0x00000008 #define NDIS_PACKET_TYPE_BROADCAST 0x00000008
#define RNDIS_PACKET_TYPE_SOURCE_ROUTING 0x00000010 #define NDIS_PACKET_TYPE_SOURCE_ROUTING 0x00000010
#define RNDIS_PACKET_TYPE_PROMISCUOUS 0x00000020 #define NDIS_PACKET_TYPE_PROMISCUOUS 0x00000020
#define RNDIS_PACKET_TYPE_SMT 0x00000040 #define NDIS_PACKET_TYPE_SMT 0x00000040
#define RNDIS_PACKET_TYPE_ALL_LOCAL 0x00000080 #define NDIS_PACKET_TYPE_ALL_LOCAL 0x00000080
#define RNDIS_PACKET_TYPE_GROUP 0x00001000 #define NDIS_PACKET_TYPE_GROUP 0x00001000
#define RNDIS_PACKET_TYPE_ALL_FUNCTIONAL 0x00002000 #define NDIS_PACKET_TYPE_ALL_FUNCTIONAL 0x00002000
#define RNDIS_PACKET_TYPE_FUNCTIONAL 0x00004000 #define NDIS_PACKET_TYPE_FUNCTIONAL 0x00004000
#define RNDIS_PACKET_TYPE_MAC_FRAME 0x00008000 #define NDIS_PACKET_TYPE_MAC_FRAME 0x00008000
/* RNDIS offsets */ /* RNDIS offsets */
#define RNDIS_HEADER_OFFSET 8 /* bytes */ #define RNDIS_HEADER_OFFSET 8 /* bytes */