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

The supposed OLD STYLE network MAC id tuple was really just a buggy

Browse Source 
expression in the card in question.  Since that driver uses a
different mechanism, retire the workaround for this bug.
This commit is contained in:
Warner Losh 2005-07-13 14:59:06 +00:00
parent 8eed5fe88e
commit c8d6e442b8
2 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/dev/pccard/pccard_cis.c
View File

@ -779,9 +779,8 @@ pccard_parse_cis_tuple(const struct pccard_tuple *tuple, void *arg)
* also handle the '6' case. So far no cards have surfaced
* with a length of '6'.
*/
if (tuple->length == 5 ) {
if (tuple->length == 5 )
state->card->prodext = pccard_tuple_read_1(tuple, 4);
}
DPRINTF(("CISTPL_MANFID\n"));
break;
case CISTPL_FUNCID:
@ -1289,17 +1288,6 @@ decode_funce(const struct pccard_tuple *tuple, struct pccard_function *pf)
= pccard_tuple_read_1(tuple, i + 2);
}
pf->pf_funce_lan_nidlen = len;
} else if (type == PCCARD_TPLFE_TYPE_LAN_OLD_NID) {
/* Some older cards have this format, no idea if it is standard */
if (tuple->length != 13)
break;
len = pccard_tuple_read_1(tuple, 4);
if (len != 6)
break;
for (i = 0; i < len; i++) {
pf->pf_funce_lan_nid[i]
= pccard_tuple_read_1(tuple, i + 5);
}
}
break;
default:

1
sys/dev/pccard/pccard_cis.h
View File

@ -168,7 +168,6 @@
#define PCCARD_FUNCTION_SECURITY 9
#define PCCARD_FUNCTION_INSTRUMENT 10
#define CISTPL_FUNCE 0x22
#define PCCARD_TPLFE_TYPE_LAN_OLD_NID 0x00 /* Old way? */
#define PCCARD_TPLFE_TYPE_LAN_TECH 0x01
#define PCCARD_TPLFE_TYPE_LAN_SPEED 0x02
#define PCCARD_TPLFE_TYPE_LAN_MEDIA 0x03