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

The private data section of ndis_packets has a 'packet flags' byte

Browse Source 
which has two important flags in it: the 'allocated by NDIS' flag
and the 'media specific info present' flag. There are two Windows macros
for getting/setting media specific info fields within the ndis_packet
structure which can behave improperly if these flags are not initialized
correctly when a packet is allocated. It seems the correct thing
to do is always set the NDIS_PACKET_ALLOCATED_BY_NDIS flag on
all newly allocated packets.

This fixes the crashes with the Intel Centrino wireless driver.
My sample card now seems to work correctly.

Also, fix a potential LOR involving ndis_txeof() in if_ndis.c.
This commit is contained in:
Bill Paul 2004-01-09 06:53:49 +00:00
parent 2511c244ad
commit e6003d0862
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=124278
4 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys/compat/ndis/kern_ndis.c
View File

@ -600,6 +600,7 @@ ndis_mtop(m0, p)
priv = &(*p)->np_private;
priv->npp_totlen = m0->m_pkthdr.len;
priv->npp_packetooboffset = offsetof(ndis_packet, np_oob);
priv->npp_ndispktflags = NDIS_PACKET_ALLOCATED_BY_NDIS;
for (m = m0; m != NULL; m = m->m_next) {
if (m->m_len == 0)

4
sys/compat/ndis/ndis_var.h
View File

@ -919,6 +919,10 @@ struct ndis_packet_private {
#define NDIS_FLAGS_SENT_AT_DPC 0x00001000
#define NDIS_FLAGS_USES_SG_BUFFER_LIST 0x00002000
#define NDIS_PACKET_WRAPPER_RESERVED 0x3F
#define NDIS_PACKET_CONTAINS_MEDIA_SPECIFIC_INFO 0x40
#define NDIS_PACKET_ALLOCATED_BY_NDIS 0x80
#define NDIS_PROTOCOL_ID_DEFAULT 0x00
#define NDIS_PROTOCOL_ID_TCP_IP 0x02
#define NDIS_PROTOCOL_ID_IPX 0x06

7
sys/compat/ndis/subr_ndis.c
View File

@ -1548,6 +1548,13 @@ ndis_alloc_packet(status, packet, pool)
pkt->np_private.npp_packetooboffset =
offsetof(ndis_packet, np_oob);
/*
* We must initialize the packet flags correctly in order
* for the NDIS_SET_PACKET_MEDIA_SPECIFIC_INFO() and
* NDIS_GET_PACKET_MEDIA_SPECIFIC_INFO() to work correctly.
*/
pkt->np_private.npp_ndispktflags = NDIS_PACKET_ALLOCATED_BY_NDIS;
*packet = pkt;
head->np_private.npp_count++;

6
sys/dev/if_ndis/if_ndis.c
View File

@ -757,8 +757,6 @@ ndis_txeof(adapter, packet, status)
sc = (struct ndis_softc *)block->nmb_ifp;
ifp = block->nmb_ifp;
NDIS_LOCK(sc);
m = packet->np_m0;
idx = packet->np_txidx;
ifp->if_opackets++;
@ -772,8 +770,6 @@ ndis_txeof(adapter, packet, status)
ifp->if_timer = 0;
ifp->if_flags &= ~IFF_OACTIVE;
NDIS_UNLOCK(sc);
m_freem(m);
taskqueue_enqueue(taskqueue_swi, &sc->ndis_starttask);
@ -843,7 +839,9 @@ ndis_intrtask(arg, pending)
sc = arg;
ifp = &sc->arpcom.ac_if;
NDIS_LOCK(sc);
ndis_intrhand(sc);
NDIS_UNLOCK(sc);
mtx_lock(&sc->ndis_intrmtx);
ndis_enable_intr(sc);
mtx_unlock(&sc->ndis_intrmtx);