Attachment #165913 for bug #202097

View | Details | Raw Unified | Return to bug 202097
Collapse All | Expand All





struct iodesc sockets[SOPEN_MAX];
#ifdef NETIF_DEBUG
int netif_debug = 1;
#endif

/*

		
#ifdef NETIF_DEBUG
			if (netif_debug)
				printf("  * %s%d:\n", drv->netif_bname,
				    cur_if.nif_unit);
#endif


				if (drv->netif_ifs[u].dif_used & (1 << s)) {
#ifdef NETIF_DEBUG
					if (netif_debug)
						printf("    [%d used]\n", s);
#endif
					continue;
				}

				val = netif_match(&cur_if, machdep_hint);
#ifdef NETIF_DEBUG
				if (netif_debug)
					printf("    [%d -> %d]\n", s, val);
#endif
				if (val > best_val) {
					best_val = val;

					best_if = cur_if;
				}
			}
#ifdef NETIF_DEBUG
			if (netif_debug)
				printf("\n");
#endif
		}
	}


Lines 8-13 Link Here

(-)lib/libstand/netif.h (+2 lines)
8		8
9	#define NENTS(x) sizeof(x)/sizeof(x[0])	9	#define NENTS(x) sizeof(x)/sizeof(x[0])
10		10
		11	#define NETIF_DEBUG 1
		12
11	struct netif_driver {	13	struct netif_driver {
12	const char *netif_bname;	14	const char *netif_bname;
13	int (netif_match)(struct netif , void *);	15	int (netif_match)(struct netif , void *);

Lines 68-74 Link Here

(-)sys/boot/common/dev_net.c (-1 / +1 lines)
68	#include "bootstrap.h"	68	#include "bootstrap.h"
69		69
70	#ifdef NETIF_DEBUG	70	#ifdef NETIF_DEBUG
71	int debug = 0;	71	int debug = 1;
72	#endif	72	#endif
73		73
74	static char *netdev_name;	74	static char *netdev_name;

Lines 101-106 Link Here

(-)sys/boot/efi/libefi/efinet.c (+2 lines)
101	{	101	{
102	struct devdesc *dev = machdep_hint;	102	struct devdesc *dev = machdep_hint;
103		103
		104	printf(" efinet_match(): d_unit=%d, nif_unit=%d\n", dev->d_unit, nif->nif_unit);
		105
104	if (dev->d_unit - 1 == nif->nif_unit)	106	if (dev->d_unit - 1 == nif->nif_unit)
105	return (1);	107	return (1);
106	return(0);	108	return(0);

Return to bug 202097

Lines 49-55 Link Here

(-)lib/libstand/netif.c (-8 / +4 lines)
49		49
50	struct iodesc sockets[SOPEN_MAX];	50	struct iodesc sockets[SOPEN_MAX];
51	#ifdef NETIF_DEBUG	51	#ifdef NETIF_DEBUG
52	int netif_debug = 0;	52	int netif_debug = 1;
53	#endif	53	#endif
54		54
55	/*	55	/*
Lines 114-120 Link Here
114		114
115	#ifdef NETIF_DEBUG	115	#ifdef NETIF_DEBUG
116	if (netif_debug)	116	if (netif_debug)
117	printf("\t%s%d:", drv->netif_bname,	117	printf(" * %s%d:\n", drv->netif_bname,
118	cur_if.nif_unit);	118	cur_if.nif_unit);
119	#endif	119	#endif
120		120
Lines 124-130 Link Here
124	if (drv->netif_ifs[u].dif_used & (1 << s)) {	124	if (drv->netif_ifs[u].dif_used & (1 << s)) {
125	#ifdef NETIF_DEBUG	125	#ifdef NETIF_DEBUG
126	if (netif_debug)	126	if (netif_debug)
127	printf(" [%d used]", s);	127	printf(" [%d used]\n", s);
128	#endif	128	#endif
129	continue;	129	continue;
130	}	130	}
Lines 132-138 Link Here
132	val = netif_match(&cur_if, machdep_hint);	132	val = netif_match(&cur_if, machdep_hint);
133	#ifdef NETIF_DEBUG	133	#ifdef NETIF_DEBUG
134	if (netif_debug)	134	if (netif_debug)
135	printf(" [%d -> %d]", s, val);	135	printf(" [%d -> %d]\n", s, val);
136	#endif	136	#endif
137	if (val > best_val) {	137	if (val > best_val) {
138	best_val = val;	138	best_val = val;
Lines 139-148 Link Here
139	best_if = cur_if;	139	best_if = cur_if;
140	}	140	}
141	}	141	}
142	#ifdef NETIF_DEBUG
143	if (netif_debug)
144	printf("\n");
145	#endif
146	}	142	}
147	}	143	}
148		144