Thu Mar 3 05:56:36 2022 UTC ()
usbnet: Fix type of struct usbnet::un_ed according to plan.


(riastradh)
diff -r1.31 -r1.32 src/sys/dev/usb/usbnet.h
cvs diff -r1.31 -r1.32 src/sys/dev/usb/usbnet.h (expand / switch to unified diff)

--- src/sys/dev/usb/usbnet.h 2022/03/03 05:56:28 1.31
+++ src/sys/dev/usb/usbnet.h 2022/03/03 05:56:36 1.32
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: usbnet.h,v 1.31 2022/03/03 05:56:28 riastradh Exp $ */ 1/* $NetBSD: usbnet.h,v 1.32 2022/03/03 05:56:36 riastradh Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2019 Matthew R. Green 4 * Copyright (c) 2019 Matthew R. Green
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
@@ -252,31 +252,28 @@ struct usbnet { @@ -252,31 +252,28 @@ struct usbnet {
252 struct usbnet_intr *un_intr; 252 struct usbnet_intr *un_intr;
253 253
254 /* Inputs for rx/tx chain control. */ 254 /* Inputs for rx/tx chain control. */
255 unsigned un_rx_bufsz; 255 unsigned un_rx_bufsz;
256 unsigned un_tx_bufsz; 256 unsigned un_tx_bufsz;
257 unsigned un_rx_list_cnt; 257 unsigned un_rx_list_cnt;
258 unsigned un_tx_list_cnt; 258 unsigned un_tx_list_cnt;
259 int un_rx_xfer_flags; 259 int un_rx_xfer_flags;
260 int un_tx_xfer_flags; 260 int un_tx_xfer_flags;
261 261
262 /* 262 /*
263 * This section should be filled in before calling 263 * This section should be filled in before calling
264 * usbnet_attach_ifp(). 264 * usbnet_attach_ifp().
265 * 
266 * XXX This should be of type "uByte". enum usbnet_ep 
267 * is the index. Fix this in a kernel version bump. 
268 */ 265 */
269 enum usbnet_ep un_ed[USBNET_ENDPT_MAX]; 266 uByte un_ed[USBNET_ENDPT_MAX];
270 267
271 /* MII specific. Not used without MII. */ 268 /* MII specific. Not used without MII. */
272 int un_phyno; 269 int un_phyno;
273 /* Ethernet specific. All zeroes indicates non-Ethernet. */ 270 /* Ethernet specific. All zeroes indicates non-Ethernet. */
274 uint8_t un_eaddr[ETHER_ADDR_LEN]; 271 uint8_t un_eaddr[ETHER_ADDR_LEN];
275 272
276 /* 273 /*
277 * This section is for driver to use, not touched by usbnet. 274 * This section is for driver to use, not touched by usbnet.
278 */ 275 */
279 unsigned un_flags; 276 unsigned un_flags;
280 277
281 /* 278 /*
282 * This section is private to usbnet. Don't touch. 279 * This section is private to usbnet. Don't touch.