diff options
| author | imp <imp@FreeBSD.org> | 2005-07-13 14:59:06 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2005-07-13 14:59:06 +0000 |
| commit | 538ccfb68eab21280dc299125f3de792dcdf8377 (patch) | |
| tree | 28a3b5113ad2fd99864f8b2c57e25afc5305ef03 /sys/dev/pccard | |
| parent | 119e3e5841265aff988b3f9e400571e1e7529a1b (diff) | |
| download | FreeBSD-src-538ccfb68eab21280dc299125f3de792dcdf8377.zip FreeBSD-src-538ccfb68eab21280dc299125f3de792dcdf8377.tar.gz | |
The supposed OLD STYLE network MAC id tuple was really just a buggy
expression in the card in question. Since that driver uses a
different mechanism, retire the workaround for this bug.
Diffstat (limited to 'sys/dev/pccard')
| -rw-r--r-- | sys/dev/pccard/pccard_cis.c | 14 | ||||
| -rw-r--r-- | sys/dev/pccard/pccard_cis.h | 1 |
2 files changed, 1 insertions, 14 deletions
diff --git a/sys/dev/pccard/pccard_cis.c b/sys/dev/pccard/pccard_cis.c index 6a965e7..60b849e 100644 --- a/sys/dev/pccard/pccard_cis.c +++ b/sys/dev/pccard/pccard_cis.c @@ -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: diff --git a/sys/dev/pccard/pccard_cis.h b/sys/dev/pccard/pccard_cis.h index 2db3064..d6b9c38 100644 --- a/sys/dev/pccard/pccard_cis.h +++ b/sys/dev/pccard/pccard_cis.h @@ -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 |
