Module Name: src Committed By: msaitoh Date: Wed Apr 24 05:07:20 UTC 2019
Modified Files: src/sys/net: if_media.h Log Message: No functional change: - IFM_AVALID and IFM_ACTIVE are NOT for the media word. Fix comment. - RFU stands for Reserved for Future Use. To generate a diff of this commit: cvs rdiff -u -r1.62 -r1.63 src/sys/net/if_media.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/net/if_media.h diff -u src/sys/net/if_media.h:1.62 src/sys/net/if_media.h:1.63 --- src/sys/net/if_media.h:1.62 Wed Apr 17 07:04:03 2019 +++ src/sys/net/if_media.h Wed Apr 24 05:07:20 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: if_media.h,v 1.62 2019/04/17 07:04:03 msaitoh Exp $ */ +/* $NetBSD: if_media.h,v 1.63 2019/04/24 05:07:20 msaitoh Exp $ */ /*- * Copyright (c) 1998, 2000, 2001 The NetBSD Foundation, Inc. @@ -84,6 +84,12 @@ #endif /*_KERNEL */ /* + * Status bits. THIS IS NOT A MEDIA WORD. + */ +#define IFM_AVALID 0x00000001 /* Active bit valid */ +#define IFM_ACTIVE 0x00000002 /* Interface attached to working net */ + +/* * if_media Options word: * Bits Use * ---- ------- @@ -91,16 +97,16 @@ * 5-7 Media type * 8-15 Type specific options * 16-18 Mode (for multi-mode devices) - * 19 RFU (not used) + * 19 (Reserved for Future Use) * 20-27 Shared (global) options * 28-31 Instance * * 3 2 1 * 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 * +-------+---------------+-+-----+---------------+-----+---------+ - * | | |R| | | | |STA| - * | IMASK | GMASK |F|MMASK| OMASK |NMASK| +---| - * | | |U| | | | TMASK | + * | | |R| | | | | + * | IMASK | GMASK |F|MMASK| OMASK |NMASK| TMASK | + * | | |U| | | | | * +-------+---------------+-+-----+---------------+-----+---------+ * <-----> <---> <---> * IFM_INST() IFM_MODE() IFM_TYPE() @@ -174,12 +180,6 @@ #define IFM_NONE 2 /* Deselect all media */ /* - * Status bits (IFM_TMASK) - */ -#define IFM_AVALID 0x00000001 /* Active bit valid */ -#define IFM_ACTIVE 0x00000002 /* Interface attached to working net */ - -/* * Shared (global) options (IFM_GMASK) */ #define IFM_FDX 0x00100000 /* Force full duplex */