slp/linux-wlan-ng
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Updated version number and fixed some printk's in typedrop.

Browse source
This commit is contained in:
mark 2002-03-04 18:46:34 +00:00
parent 0612b419c4
commit 122981a331
3 changed files with 66 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
config.in
View file

@ -1,7 +1,7 @@
WLAN_VERSION=0
WLAN_PATCHLEVEL=1
WLAN_SUBLEVEL=13
WLAN_EXTRAVERSION=
WLAN_SUBLEVEL=14
WLAN_EXTRAVERSION=-pre1
LINUX_SRC=/usr/src/linux
WLAN_TARGET_ARCH=
PCMCIA_SRC=

64
src/prism2/driver/hfa384x.c
View file

@ -329,9 +329,9 @@ txfid_queue_remove(hfa384x_t *hw)
{
UINT16 result= 0;
if (txfid_queue_empty(hw))
printk("queue empty.\n");
else {
if (txfid_queue_empty(hw)) {
WLAN_LOG_DEBUG0(3,"queue empty.\n");
} else {
result = hw->txfid_queue[hw->txfid_head];
hw->txfid_head = (hw->txfid_head + 1) % hw->txfid_N;
}
@ -346,7 +346,7 @@ txfid_queue_add(hfa384x_t *hw, UINT16 val)
if (txfid_queue_full(hw)) {
result = -1;
printk("queue full.\n");
WLAN_LOG_DEBUG0(3,"queue full.\n");
} else {
hw->txfid_queue[hw->txfid_tail] = val;
result = hw->txfid_tail;
@ -4037,96 +4037,96 @@ int hfa384x_int_rx_typedrop( wlandevice_t *wlandev, UINT16 fc)
#endif
switch ( ftype ) {
case WLAN_FTYPE_MGMT:
WLAN_LOG_WARNING0("prism2sta_ev_rx(): rx'd mgmt:");
WLAN_LOG_DEBUG0(3, "prism2sta_ev_rx(): rx'd mgmt:\n");
wlandev->rx.mgmt++;
switch( fstype ) {
case WLAN_FSTYPE_ASSOCREQ:
printk("assocreq");
/* printk("assocreq"); */
wlandev->rx.assocreq++;
break;
case WLAN_FSTYPE_ASSOCRESP:
printk("assocresp");
/* printk("assocresp"); */
wlandev->rx.assocresp++;
break;
case WLAN_FSTYPE_REASSOCREQ:
printk("reassocreq");
/* printk("reassocreq"); */
wlandev->rx.reassocreq++;
break;
case WLAN_FSTYPE_REASSOCRESP:
printk("reassocresp");
/* printk("reassocresp"); */
wlandev->rx.reassocresp++;
break;
case WLAN_FSTYPE_PROBEREQ:
printk("probereq");
/* printk("probereq"); */
wlandev->rx.probereq++;
break;
case WLAN_FSTYPE_PROBERESP:
printk("proberesp");
/* printk("proberesp"); */
wlandev->rx.proberesp++;
break;
case WLAN_FSTYPE_BEACON:
printk("beacon");
/* printk("beacon"); */
wlandev->rx.beacon++;
break;
case WLAN_FSTYPE_ATIM:
printk("atim");
/* printk("atim"); */
wlandev->rx.atim++;
break;
case WLAN_FSTYPE_DISASSOC:
printk("disassoc");
/* printk("disassoc"); */
wlandev->rx.disassoc++;
break;
case WLAN_FSTYPE_AUTHEN:
printk("authen");
/* printk("authen"); */
wlandev->rx.authen++;
break;
case WLAN_FSTYPE_DEAUTHEN:
printk("deauthen");
/* printk("deauthen"); */
wlandev->rx.deauthen++;
break;
default:
printk("unknown");
/* printk("unknown"); */
wlandev->rx.mgmt_unknown++;
break;
}
printk("\n");
/* printk("\n"); */
drop = 1;
break;
case WLAN_FTYPE_CTL:
WLAN_LOG_WARNING0("prism2sta_ev_rx(): rx'd ctl:");
WLAN_LOG_DEBUG0(3, "prism2sta_ev_rx(): rx'd ctl:\n");
wlandev->rx.ctl++;
switch( fstype ) {
case WLAN_FSTYPE_PSPOLL:
printk("pspoll");
/* printk("pspoll"); */
wlandev->rx.pspoll++;
break;
case WLAN_FSTYPE_RTS:
printk("rts");
/* printk("rts"); */
wlandev->rx.rts++;
break;
case WLAN_FSTYPE_CTS:
printk("cts");
/* printk("cts"); */
wlandev->rx.cts++;
break;
case WLAN_FSTYPE_ACK:
printk("ack");
/* printk("ack"); */
wlandev->rx.ack++;
break;
case WLAN_FSTYPE_CFEND:
printk("cfend");
/* printk("cfend"); */
wlandev->rx.cfend++;
break;
case WLAN_FSTYPE_CFENDCFACK:
printk("cfendcfack");
/* printk("cfendcfack"); */
wlandev->rx.cfendcfack++;
break;
default:
printk("unknown");
/* printk("unknown"); */
wlandev->rx.ctl_unknown++;
break;
}
printk("\n");
/* printk("\n"); */
drop = 1;
break;
@ -4146,23 +4146,23 @@ int hfa384x_int_rx_typedrop( wlandevice_t *wlandev, UINT16 fc)
wlandev->rx.data__cfack_cfpoll++;
break;
case WLAN_FSTYPE_NULL:
WLAN_LOG_WARNING0("prism2sta_ev_rx(): rx'd data:null\n");
WLAN_LOG_DEBUG0(3, "prism2sta_ev_rx(): rx'd data:null\n");
wlandev->rx.null++;
break;
case WLAN_FSTYPE_CFACK:
WLAN_LOG_WARNING0("prism2sta_ev_rx(): rx'd data:cfack\n");
WLAN_LOG_DEBUG0(3, "prism2sta_ev_rx(): rx'd data:cfack\n");
wlandev->rx.cfack++;
break;
case WLAN_FSTYPE_CFPOLL:
WLAN_LOG_WARNING0("prism2sta_ev_rx(): rx'd data:cfpoll\n");
WLAN_LOG_DEBUG0(3, "prism2sta_ev_rx(): rx'd data:cfpoll\n");
wlandev->rx.cfpoll++;
break;
case WLAN_FSTYPE_CFACK_CFPOLL:
WLAN_LOG_WARNING0("prism2sta_ev_rx(): rx'd data:cfack_cfpoll\n");
WLAN_LOG_DEBUG0(3, "prism2sta_ev_rx(): rx'd data:cfack_cfpoll\n");
wlandev->rx.cfack_cfpoll++;
break;
default:
printk("unknown");
/* printk("unknown"); */
wlandev->rx.data_unknown++;
break;
}

61
src/prism2/driver/hfa384x_usb.c
View file

@ -3390,7 +3390,8 @@ void hfa384x_rxmonitor( wlandevice_t *wlandev, UINT16 rxfid, hfa384x_rx_frame_t
* Call context:
* interrupt
----------------------------------------------------------------*/
int hfa384x_rx_typedrop( wlandevice_t *wlandev, UINT16 fc)
int
hfa384x_rx_typedrop( wlandevice_t *wlandev, UINT16 fc)
{
UINT16 ftype;
UINT16 fstype;
@ -3398,100 +3399,102 @@ int hfa384x_rx_typedrop( wlandevice_t *wlandev, UINT16 fc)
/* Classify frame, increment counter */
ftype = WLAN_GET_FC_FTYPE(fc);
fstype = WLAN_GET_FC_FSTYPE(fc);
#if 0
WLAN_LOG_DEBUG2(4,
"rx_typedrop : ftype=%d fstype=%d.\n", ftype, fstype);
#endif
switch ( ftype ) {
case WLAN_FTYPE_MGMT:
WLAN_LOG_WARNING0("prism2sta_ev_rx(): rx'd mgmt:");
WLAN_LOG_DEBUG0(3, "prism2sta_ev_rx(): rx'd mgmt:\n");
wlandev->rx.mgmt++;
switch( fstype ) {
case WLAN_FSTYPE_ASSOCREQ:
printk("assocreq");
/* printk("assocreq"); */
wlandev->rx.assocreq++;
break;
case WLAN_FSTYPE_ASSOCRESP:
printk("assocresp");
/* printk("assocresp"); */
wlandev->rx.assocresp++;
break;
case WLAN_FSTYPE_REASSOCREQ:
printk("reassocreq");
/* printk("reassocreq"); */
wlandev->rx.reassocreq++;
break;
case WLAN_FSTYPE_REASSOCRESP:
printk("reassocresp");
/* printk("reassocresp"); */
wlandev->rx.reassocresp++;
break;
case WLAN_FSTYPE_PROBEREQ:
printk("probereq");
/* printk("probereq"); */
wlandev->rx.probereq++;
break;
case WLAN_FSTYPE_PROBERESP:
printk("proberesp");
/* printk("proberesp"); */
wlandev->rx.proberesp++;
break;
case WLAN_FSTYPE_BEACON:
printk("beacon");
/* printk("beacon"); */
wlandev->rx.beacon++;
break;
case WLAN_FSTYPE_ATIM:
printk("atim");
/* printk("atim"); */
wlandev->rx.atim++;
break;
case WLAN_FSTYPE_DISASSOC:
printk("disassoc");
/* printk("disassoc"); */
wlandev->rx.disassoc++;
break;
case WLAN_FSTYPE_AUTHEN:
printk("authen");
/* printk("authen"); */
wlandev->rx.authen++;
break;
case WLAN_FSTYPE_DEAUTHEN:
printk("deauthen");
/* printk("deauthen"); */
wlandev->rx.deauthen++;
break;
default:
printk("unknown");
/* printk("unknown"); */
wlandev->rx.mgmt_unknown++;
break;
}
printk("\n");
/* printk("\n"); */
drop = 1;
break;
case WLAN_FTYPE_CTL:
WLAN_LOG_WARNING0("prism2sta_ev_rx(): rx'd ctl:");
WLAN_LOG_DEBUG0(3, "prism2sta_ev_rx(): rx'd ctl:\n");
wlandev->rx.ctl++;
switch( fstype ) {
case WLAN_FSTYPE_PSPOLL:
printk("pspoll");
/* printk("pspoll"); */
wlandev->rx.pspoll++;
break;
case WLAN_FSTYPE_RTS:
printk("rts");
/* printk("rts"); */
wlandev->rx.rts++;
break;
case WLAN_FSTYPE_CTS:
printk("cts");
/* printk("cts"); */
wlandev->rx.cts++;
break;
case WLAN_FSTYPE_ACK:
printk("ack");
/* printk("ack"); */
wlandev->rx.ack++;
break;
case WLAN_FSTYPE_CFEND:
printk("cfend");
/* printk("cfend"); */
wlandev->rx.cfend++;
break;
case WLAN_FSTYPE_CFENDCFACK:
printk("cfendcfack");
/* printk("cfendcfack"); */
wlandev->rx.cfendcfack++;
break;
default:
printk("unknown");
/* printk("unknown"); */
wlandev->rx.ctl_unknown++;
break;
}
printk("\n");
/* printk("\n"); */
drop = 1;
break;
@ -3511,23 +3514,23 @@ int hfa384x_rx_typedrop( wlandevice_t *wlandev, UINT16 fc)
wlandev->rx.data__cfack_cfpoll++;
break;
case WLAN_FSTYPE_NULL:
WLAN_LOG_WARNING0("prism2sta_ev_rx(): rx'd data:null\n");
WLAN_LOG_DEBUG0(3, "prism2sta_ev_rx(): rx'd data:null\n");
wlandev->rx.null++;
break;
case WLAN_FSTYPE_CFACK:
WLAN_LOG_WARNING0("prism2sta_ev_rx(): rx'd data:cfack\n");
WLAN_LOG_DEBUG0(3, "prism2sta_ev_rx(): rx'd data:cfack\n");
wlandev->rx.cfack++;
break;
case WLAN_FSTYPE_CFPOLL:
WLAN_LOG_WARNING0("prism2sta_ev_rx(): rx'd data:cfpoll\n");
WLAN_LOG_DEBUG0(3, "prism2sta_ev_rx(): rx'd data:cfpoll\n");
wlandev->rx.cfpoll++;
break;
case WLAN_FSTYPE_CFACK_CFPOLL:
WLAN_LOG_WARNING0("prism2sta_ev_rx(): rx'd data:cfack_cfpoll\n");
WLAN_LOG_DEBUG0(3, "prism2sta_ev_rx(): rx'd data:cfack_cfpoll\n");
wlandev->rx.cfack_cfpoll++;
break;
default:
printk("unknown");
/* printk("unknown"); */
wlandev->rx.data_unknown++;
break;
}