Author: sephe
Date: Thu Oct 13 03:23:43 2016
New Revision: 307175
URL: https://svnweb.freebsd.org/changeset/base/307175
Log:
MFC 304654,304722,304723
304654
net: Split RNDIS protocol structs/macros out of dev/usb/net/if_urndisreg.h
So that Hyper-V can leverage them instead of rolling its own definition.
Discussed with: hps
Reviewed by: hps
Sponsored by: Microsoft
Differential Revision: https://reviews.freebsd.org/D7592
304722
net/rndis: Add canonical RNDIS major/minor version as of today.
Reviewed by: hps
Sponsored by: Microsoft
Differential Revision: https://reviews.freebsd.org/D7593
304723
net/rndis: Fix RNDIS_STATUS_PENDING definition.
While I'm here, sort the RNDIS status in ascending order.
Sponsored by: Microsoft
Differential Revision: https://reviews.freebsd.org/D7594
Added:
stable/10/sys/net/rndis.h
- copied, changed from r304654, head/sys/net/rndis.h
Modified:
stable/10/sys/dev/usb/net/if_urndis.c
stable/10/sys/dev/usb/net/if_urndisreg.h
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/dev/usb/net/if_urndis.c
==============================================================================
--- stable/10/sys/dev/usb/net/if_urndis.c Thu Oct 13 03:16:15 2016
(r307174)
+++ stable/10/sys/dev/usb/net/if_urndis.c Thu Oct 13 03:23:43 2016
(r307175)
@@ -45,6 +45,7 @@ __FBSDID("$FreeBSD$");
#include <net/if.h>
#include <net/if_var.h>
+#include <net/rndis.h>
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
@@ -79,17 +80,17 @@ static uether_fn_t urndis_setmulti;
static uether_fn_t urndis_setpromisc;
static uint32_t urndis_ctrl_query(struct urndis_softc *sc, uint32_t oid,
- struct urndis_query_req *msg, uint16_t len,
+ struct rndis_query_req *msg, uint16_t len,
const void **rbuf, uint16_t *rbufsz);
static uint32_t urndis_ctrl_set(struct urndis_softc *sc, uint32_t oid,
- struct urndis_set_req *msg, uint16_t len);
+ struct rndis_set_req *msg, uint16_t len);
static uint32_t urndis_ctrl_handle_init(struct urndis_softc *sc,
- const struct urndis_comp_hdr *hdr);
+ const struct rndis_comp_hdr *hdr);
static uint32_t urndis_ctrl_handle_query(struct urndis_softc *sc,
- const struct urndis_comp_hdr *hdr, const void **buf,
+ const struct rndis_comp_hdr *hdr, const void **buf,
uint16_t *bufsz);
static uint32_t urndis_ctrl_handle_reset(struct urndis_softc *sc,
- const struct urndis_comp_hdr *hdr);
+ const struct rndis_comp_hdr *hdr);
static uint32_t urndis_ctrl_init(struct urndis_softc *sc);
static uint32_t urndis_ctrl_halt(struct urndis_softc *sc);
@@ -211,8 +212,8 @@ urndis_attach(device_t dev)
{
static struct {
union {
- struct urndis_query_req query;
- struct urndis_set_req set;
+ struct rndis_query_req query;
+ struct rndis_set_req set;
} hdr;
union {
uint8_t eaddr[ETHER_ADDR_LEN];
@@ -452,10 +453,10 @@ urndis_ctrl_send(struct urndis_softc *sc
return (err);
}
-static struct urndis_comp_hdr *
+static struct rndis_comp_hdr *
urndis_ctrl_recv(struct urndis_softc *sc)
{
- struct urndis_comp_hdr *hdr;
+ struct rndis_comp_hdr *hdr;
usb_error_t err;
err = urndis_ctrl_msg(sc, UT_READ_CLASS_INTERFACE,
@@ -465,7 +466,7 @@ urndis_ctrl_recv(struct urndis_softc *sc
if (err != USB_ERR_NORMAL_COMPLETION)
return (NULL);
- hdr = (struct urndis_comp_hdr *)sc->sc_response_buf;
+ hdr = (struct rndis_comp_hdr *)sc->sc_response_buf;
DPRINTF("type 0x%x len %u\n", le32toh(hdr->rm_type),
le32toh(hdr->rm_len));
@@ -479,7 +480,7 @@ urndis_ctrl_recv(struct urndis_softc *sc
}
static uint32_t
-urndis_ctrl_handle(struct urndis_softc *sc, struct urndis_comp_hdr *hdr,
+urndis_ctrl_handle(struct urndis_softc *sc, struct rndis_comp_hdr *hdr,
const void **buf, uint16_t *bufsz)
{
uint32_t rval;
@@ -520,11 +521,11 @@ urndis_ctrl_handle(struct urndis_softc *
static uint32_t
urndis_ctrl_handle_init(struct urndis_softc *sc,
- const struct urndis_comp_hdr *hdr)
+ const struct rndis_comp_hdr *hdr)
{
- const struct urndis_init_comp *msg;
+ const struct rndis_init_comp *msg;
- msg = (const struct urndis_init_comp *)hdr;
+ msg = (const struct rndis_init_comp *)hdr;
DPRINTF("len %u rid %u status 0x%x "
"ver_major %u ver_minor %u devflags 0x%x medium 0x%x pktmaxcnt %u "
@@ -563,12 +564,12 @@ urndis_ctrl_handle_init(struct urndis_so
static uint32_t
urndis_ctrl_handle_query(struct urndis_softc *sc,
- const struct urndis_comp_hdr *hdr, const void **buf, uint16_t *bufsz)
+ const struct rndis_comp_hdr *hdr, const void **buf, uint16_t *bufsz)
{
- const struct urndis_query_comp *msg;
+ const struct rndis_query_comp *msg;
uint64_t limit;
- msg = (const struct urndis_query_comp *)hdr;
+ msg = (const struct rndis_query_comp *)hdr;
DPRINTF("len %u rid %u status 0x%x "
"buflen %u bufoff %u\n",
@@ -608,12 +609,12 @@ urndis_ctrl_handle_query(struct urndis_s
static uint32_t
urndis_ctrl_handle_reset(struct urndis_softc *sc,
- const struct urndis_comp_hdr *hdr)
+ const struct rndis_comp_hdr *hdr)
{
- const struct urndis_reset_comp *msg;
+ const struct rndis_reset_comp *msg;
uint32_t rval;
- msg = (const struct urndis_reset_comp *)hdr;
+ msg = (const struct rndis_reset_comp *)hdr;
rval = le32toh(msg->rm_status);
@@ -629,7 +630,7 @@ urndis_ctrl_handle_reset(struct urndis_s
}
if (msg->rm_adrreset != 0) {
struct {
- struct urndis_set_req hdr;
+ struct rndis_set_req hdr;
uint32_t filter;
} msg_filter;
@@ -649,14 +650,14 @@ urndis_ctrl_handle_reset(struct urndis_s
static uint32_t
urndis_ctrl_init(struct urndis_softc *sc)
{
- struct urndis_init_req msg;
- struct urndis_comp_hdr *hdr;
+ struct rndis_init_req msg;
+ struct rndis_comp_hdr *hdr;
uint32_t rval;
msg.rm_type = htole32(REMOTE_NDIS_INITIALIZE_MSG);
msg.rm_len = htole32(sizeof(msg));
msg.rm_rid = 0;
- msg.rm_ver_major = htole32(1);
+ msg.rm_ver_major = htole32(RNDIS_VERSION_MAJOR);
msg.rm_ver_minor = htole32(1);
msg.rm_max_xfersz = htole32(RNDIS_RX_MAXLEN);
@@ -687,7 +688,7 @@ urndis_ctrl_init(struct urndis_softc *sc
static uint32_t
urndis_ctrl_halt(struct urndis_softc *sc)
{
- struct urndis_halt_req msg;
+ struct rndis_halt_req msg;
uint32_t rval;
msg.rm_type = htole32(REMOTE_NDIS_HALT_MSG);
@@ -713,10 +714,10 @@ urndis_ctrl_halt(struct urndis_softc *sc
*/
static uint32_t
urndis_ctrl_query(struct urndis_softc *sc, uint32_t oid,
- struct urndis_query_req *msg, uint16_t len, const void **rbuf,
+ struct rndis_query_req *msg, uint16_t len, const void **rbuf,
uint16_t *rbufsz)
{
- struct urndis_comp_hdr *hdr;
+ struct rndis_comp_hdr *hdr;
uint32_t datalen, rval;
msg->rm_type = htole32(REMOTE_NDIS_QUERY_MSG);
@@ -760,9 +761,9 @@ urndis_ctrl_query(struct urndis_softc *s
static uint32_t
urndis_ctrl_set(struct urndis_softc *sc, uint32_t oid,
- struct urndis_set_req *msg, uint16_t len)
+ struct rndis_set_req *msg, uint16_t len)
{
- struct urndis_comp_hdr *hdr;
+ struct rndis_comp_hdr *hdr;
uint32_t datalen, rval;
msg->rm_type = htole32(REMOTE_NDIS_SET_MSG);
@@ -812,7 +813,7 @@ urndis_bulk_read_callback(struct usb_xfe
struct urndis_softc *sc = usbd_xfer_softc(xfer);
struct usb_page_cache *pc = usbd_xfer_get_frame(xfer, 0);
struct ifnet *ifp = uether_getifp(&sc->sc_ue);
- struct urndis_packet_msg msg;
+ struct rndis_packet_msg msg;
struct mbuf *m;
int actlen;
int aframes;
@@ -872,11 +873,11 @@ urndis_bulk_read_callback(struct usb_xfe
"datalen %u\n", msg.rm_datalen, actlen);
goto tr_setup;
} else if ((msg.rm_dataoffset + msg.rm_datalen +
- (uint32_t)__offsetof(struct urndis_packet_msg,
+ (uint32_t)__offsetof(struct rndis_packet_msg,
rm_dataoffset)) > (uint32_t)actlen) {
DPRINTF("invalid dataoffset %u larger than
%u\n",
msg.rm_dataoffset + msg.rm_datalen +
- (uint32_t)__offsetof(struct
urndis_packet_msg,
+ (uint32_t)__offsetof(struct
rndis_packet_msg,
rm_dataoffset), actlen);
goto tr_setup;
} else if (msg.rm_datalen < (uint32_t)sizeof(struct
ether_header)) {
@@ -902,7 +903,7 @@ urndis_bulk_read_callback(struct usb_xfe
m_adj(m, ETHER_ALIGN);
usbd_copy_out(pc, offset + msg.rm_dataoffset +
- __offsetof(struct urndis_packet_msg,
+ __offsetof(struct rndis_packet_msg,
rm_dataoffset), m->m_data, msg.rm_datalen);
/* enqueue */
@@ -938,7 +939,7 @@ tr_setup:
static void
urndis_bulk_write_callback(struct usb_xfer *xfer, usb_error_t error)
{
- struct urndis_packet_msg msg;
+ struct rndis_packet_msg msg;
struct urndis_softc *sc = usbd_xfer_softc(xfer);
struct ifnet *ifp = uether_getifp(&sc->sc_ue);
struct mbuf *m;
Modified: stable/10/sys/dev/usb/net/if_urndisreg.h
==============================================================================
--- stable/10/sys/dev/usb/net/if_urndisreg.h Thu Oct 13 03:16:15 2016
(r307174)
+++ stable/10/sys/dev/usb/net/if_urndisreg.h Thu Oct 13 03:23:43 2016
(r307175)
@@ -55,242 +55,4 @@ struct urndis_softc {
#define URNDIS_UNLOCK(sc) mtx_unlock(&(sc)->sc_mtx)
#define URNDIS_LOCK_ASSERT(sc, what) mtx_assert(&(sc)->sc_mtx, (what))
-#define RNDIS_STATUS_BUFFER_OVERFLOW 0x80000005L
-#define RNDIS_STATUS_FAILURE 0xC0000001L
-#define RNDIS_STATUS_INVALID_DATA 0xC0010015L
-#define RNDIS_STATUS_MEDIA_CONNECT 0x4001000BL
-#define RNDIS_STATUS_MEDIA_DISCONNECT 0x4001000CL
-#define RNDIS_STATUS_NOT_SUPPORTED 0xC00000BBL
-#define RNDIS_STATUS_PENDING STATUS_PENDING /* XXX */
-#define RNDIS_STATUS_RESOURCES 0xC000009AL
-#define RNDIS_STATUS_SUCCESS 0x00000000L
-
-#define OID_GEN_SUPPORTED_LIST 0x00010101
-#define OID_GEN_HARDWARE_STATUS 0x00010102
-#define OID_GEN_MEDIA_SUPPORTED 0x00010103
-#define OID_GEN_MEDIA_IN_USE 0x00010104
-#define OID_GEN_MAXIMUM_LOOKAHEAD 0x00010105
-#define OID_GEN_MAXIMUM_FRAME_SIZE 0x00010106
-#define OID_GEN_LINK_SPEED 0x00010107
-#define OID_GEN_TRANSMIT_BUFFER_SPACE 0x00010108
-#define OID_GEN_RECEIVE_BUFFER_SPACE 0x00010109
-#define OID_GEN_TRANSMIT_BLOCK_SIZE 0x0001010A
-#define OID_GEN_RECEIVE_BLOCK_SIZE 0x0001010B
-#define OID_GEN_VENDOR_ID 0x0001010C
-#define OID_GEN_VENDOR_DESCRIPTION 0x0001010D
-#define OID_GEN_CURRENT_PACKET_FILTER 0x0001010E
-#define OID_GEN_CURRENT_LOOKAHEAD 0x0001010F
-#define OID_GEN_DRIVER_VERSION 0x00010110
-#define OID_GEN_MAXIMUM_TOTAL_SIZE 0x00010111
-#define OID_GEN_PROTOCOL_OPTIONS 0x00010112
-#define OID_GEN_MAC_OPTIONS 0x00010113
-#define OID_GEN_MEDIA_CONNECT_STATUS 0x00010114
-#define OID_GEN_MAXIMUM_SEND_PACKETS 0x00010115
-#define OID_GEN_VENDOR_DRIVER_VERSION 0x00010116
-#define OID_GEN_SUPPORTED_GUIDS 0x00010117
-#define OID_GEN_NETWORK_LAYER_ADDRESSES 0x00010118
-#define OID_GEN_TRANSPORT_HEADER_OFFSET 0x00010119
-#define OID_GEN_MACHINE_NAME 0x0001021A
-#define OID_GEN_RNDIS_CONFIG_PARAMETER 0x0001021B
-#define OID_GEN_VLAN_ID 0x0001021C
-
-#define OID_802_3_PERMANENT_ADDRESS 0x01010101
-#define OID_802_3_CURRENT_ADDRESS 0x01010102
-#define OID_802_3_MULTICAST_LIST 0x01010103
-#define OID_802_3_MAXIMUM_LIST_SIZE 0x01010104
-#define OID_802_3_MAC_OPTIONS 0x01010105
-#define OID_802_3_RCV_ERROR_ALIGNMENT 0x01020101
-#define OID_802_3_XMIT_ONE_COLLISION 0x01020102
-#define OID_802_3_XMIT_MORE_COLLISIONS 0x01020103
-#define OID_802_3_XMIT_DEFERRED 0x01020201
-#define OID_802_3_XMIT_MAX_COLLISIONS 0x01020202
-#define OID_802_3_RCV_OVERRUN 0x01020203
-#define OID_802_3_XMIT_UNDERRUN 0x01020204
-#define OID_802_3_XMIT_HEARTBEAT_FAILURE 0x01020205
-#define OID_802_3_XMIT_TIMES_CRS_LOST 0x01020206
-#define OID_802_3_XMIT_LATE_COLLISIONS 0x01020207
-
-#define RNDIS_MEDIUM_802_3 0x00000000
-
-/* Device flags */
-#define RNDIS_DF_CONNECTIONLESS 0x00000001
-#define RNDIS_DF_CONNECTION_ORIENTED 0x00000002
-
-/*
- * RNDIS data message
- */
-#define REMOTE_NDIS_PACKET_MSG 0x00000001
-
-struct urndis_packet_msg {
- uint32_t rm_type;
- uint32_t rm_len;
- uint32_t rm_dataoffset;
- uint32_t rm_datalen;
- uint32_t rm_oobdataoffset;
- uint32_t rm_oobdatalen;
- uint32_t rm_oobdataelements;
- uint32_t rm_pktinfooffset;
- uint32_t rm_pktinfolen;
- uint32_t rm_vchandle;
- uint32_t rm_reserved;
-};
-
-/*
- * RNDIS control messages
- */
-struct urndis_comp_hdr {
- uint32_t rm_type;
- uint32_t rm_len;
- uint32_t rm_rid;
- uint32_t rm_status;
-};
-
-/* Initialize the device. */
-#define REMOTE_NDIS_INITIALIZE_MSG 0x00000002
-#define REMOTE_NDIS_INITIALIZE_CMPLT 0x80000002
-
-struct urndis_init_req {
- uint32_t rm_type;
- uint32_t rm_len;
- uint32_t rm_rid;
- uint32_t rm_ver_major;
- uint32_t rm_ver_minor;
- uint32_t rm_max_xfersz;
-};
-
-struct urndis_init_comp {
- uint32_t rm_type;
- uint32_t rm_len;
- uint32_t rm_rid;
- uint32_t rm_status;
- uint32_t rm_ver_major;
- uint32_t rm_ver_minor;
- uint32_t rm_devflags;
- uint32_t rm_medium;
- uint32_t rm_pktmaxcnt;
- uint32_t rm_pktmaxsz;
- uint32_t rm_align;
- uint32_t rm_aflistoffset;
- uint32_t rm_aflistsz;
-};
-
-/* Halt the device. No response sent. */
-#define REMOTE_NDIS_HALT_MSG 0x00000003
-
-struct urndis_halt_req {
- uint32_t rm_type;
- uint32_t rm_len;
- uint32_t rm_rid;
-};
-
-/* Send a query object. */
-#define REMOTE_NDIS_QUERY_MSG 0x00000004
-#define REMOTE_NDIS_QUERY_CMPLT 0x80000004
-
-struct urndis_query_req {
- uint32_t rm_type;
- uint32_t rm_len;
- uint32_t rm_rid;
- uint32_t rm_oid;
- uint32_t rm_infobuflen;
- uint32_t rm_infobufoffset;
- uint32_t rm_devicevchdl;
-};
-
-struct urndis_query_comp {
- uint32_t rm_type;
- uint32_t rm_len;
- uint32_t rm_rid;
- uint32_t rm_status;
- uint32_t rm_infobuflen;
- uint32_t rm_infobufoffset;
-};
-
-/* Send a set object request. */
-#define REMOTE_NDIS_SET_MSG 0x00000005
-#define REMOTE_NDIS_SET_CMPLT 0x80000005
-
-struct urndis_set_req {
- uint32_t rm_type;
- uint32_t rm_len;
- uint32_t rm_rid;
- uint32_t rm_oid;
- uint32_t rm_infobuflen;
- uint32_t rm_infobufoffset;
- uint32_t rm_devicevchdl;
-};
-
-struct urndis_set_comp {
- uint32_t rm_type;
- uint32_t rm_len;
- uint32_t rm_rid;
- uint32_t rm_status;
-};
-
-#define REMOTE_NDIS_SET_PARAM_NUMERIC 0x00000000
-#define REMOTE_NDIS_SET_PARAM_STRING 0x00000002
-
-struct urndis_set_parameter {
- uint32_t rm_nameoffset;
- uint32_t rm_namelen;
- uint32_t rm_type;
- uint32_t rm_valueoffset;
- uint32_t rm_valuelen;
-};
-
-/* Perform a soft reset on the device. */
-#define REMOTE_NDIS_RESET_MSG 0x00000006
-#define REMOTE_NDIS_RESET_CMPLT 0x80000006
-
-struct urndis_reset_req {
- uint32_t rm_type;
- uint32_t rm_len;
- uint32_t rm_rid;
-};
-
-struct urndis_reset_comp {
- uint32_t rm_type;
- uint32_t rm_len;
- uint32_t rm_status;
- uint32_t rm_adrreset;
-};
-
-/* 802.3 link-state or undefined message error. */
-#define REMOTE_NDIS_INDICATE_STATUS_MSG 0x00000007
-
-/* Keepalive messsage. May be sent by device. */
-#define REMOTE_NDIS_KEEPALIVE_MSG 0x00000008
-#define REMOTE_NDIS_KEEPALIVE_CMPLT 0x80000008
-
-struct urndis_keepalive_req {
- uint32_t rm_type;
- uint32_t rm_len;
- uint32_t rm_rid;
-};
-
-struct urndis_keepalive_comp {
- uint32_t rm_type;
- uint32_t rm_len;
- uint32_t rm_rid;
- uint32_t rm_status;
-};
-
-/* 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
-
-/* RNDIS offsets */
-#define RNDIS_HEADER_OFFSET 8 /* bytes */
-#define RNDIS_DATA_OFFSET ((uint32_t)(sizeof(struct
urndis_packet_msg) - RNDIS_HEADER_OFFSET))
-
#endif /* _IF_URNDISREG_H_ */
Copied and modified: stable/10/sys/net/rndis.h (from r304654,
head/sys/net/rndis.h)
==============================================================================
--- head/sys/net/rndis.h Tue Aug 23 02:54:06 2016 (r304654, copy
source)
+++ stable/10/sys/net/rndis.h Thu Oct 13 03:23:43 2016 (r307175)
@@ -23,15 +23,19 @@
#ifndef _NET_RNDIS_H_
#define _NET_RNDIS_H_
-#define RNDIS_STATUS_BUFFER_OVERFLOW 0x80000005L
-#define RNDIS_STATUS_FAILURE 0xC0000001L
-#define RNDIS_STATUS_INVALID_DATA 0xC0010015L
+/* Canonical major/minor version as of 22th Aug. 2016. */
+#define RNDIS_VERSION_MAJOR 0x00000001
+#define RNDIS_VERSION_MINOR 0x00000000
+
+#define RNDIS_STATUS_SUCCESS 0x00000000L
+#define RNDIS_STATUS_PENDING 0x00000103L
#define RNDIS_STATUS_MEDIA_CONNECT 0x4001000BL
#define RNDIS_STATUS_MEDIA_DISCONNECT 0x4001000CL
+#define RNDIS_STATUS_BUFFER_OVERFLOW 0x80000005L
+#define RNDIS_STATUS_FAILURE 0xC0000001L
#define RNDIS_STATUS_NOT_SUPPORTED 0xC00000BBL
-#define RNDIS_STATUS_PENDING STATUS_PENDING /* XXX */
#define RNDIS_STATUS_RESOURCES 0xC000009AL
-#define RNDIS_STATUS_SUCCESS 0x00000000L
+#define RNDIS_STATUS_INVALID_DATA 0xC0010015L
#define OID_GEN_SUPPORTED_LIST 0x00010101
#define OID_GEN_HARDWARE_STATUS 0x00010102
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
