Whoops, left out the USB stuff. :)
This commit is contained in:
solomon
parent
ca5aa7a270
commit
70c477b819
|
|
@ -4150,65 +4150,87 @@ static void hfa384x_int_rxmonitor( wlandevice_t *wlandev, hfa384x_usb_rxfrm_t *r
|
|||
}
|
||||
|
||||
/* only prepend the prism header if in the right mode */
|
||||
if (wlandev->netdev->type == ARPHRD_IEEE80211_PRISM) {
|
||||
datap = skb_put(skb, sizeof(p80211msg_lnxind_wlansniffrm_t));
|
||||
msg = (p80211msg_lnxind_wlansniffrm_t*) datap;
|
||||
if ((wlandev->netdev->type == ARPHRD_IEEE80211_PRISM) &&
|
||||
(hw->sniffhdr == 0)) {
|
||||
datap = skb_put(skb, sizeof(p80211msg_lnxind_wlansniffrm_t));
|
||||
msg = (p80211msg_lnxind_wlansniffrm_t*) datap;
|
||||
|
||||
/* Initialize the message members */
|
||||
msg->msgcode = DIDmsg_lnxind_wlansniffrm;
|
||||
msg->msglen = sizeof(p80211msg_lnxind_wlansniffrm_t);
|
||||
strcpy(msg->devname, wlandev->name);
|
||||
|
||||
msg->hosttime.did = DIDmsg_lnxind_wlansniffrm_hosttime;
|
||||
msg->hosttime.status = 0;
|
||||
msg->hosttime.len = 4;
|
||||
msg->hosttime.data = jiffies;
|
||||
|
||||
msg->mactime.did = DIDmsg_lnxind_wlansniffrm_mactime;
|
||||
msg->mactime.status = 0;
|
||||
msg->mactime.len = 4;
|
||||
msg->mactime.data = rxdesc->time;
|
||||
|
||||
msg->channel.did = DIDmsg_lnxind_wlansniffrm_channel;
|
||||
msg->channel.status = 0;
|
||||
msg->channel.len = 4;
|
||||
msg->channel.data = hw->sniff_channel;
|
||||
/* Initialize the message members */
|
||||
msg->msgcode = DIDmsg_lnxind_wlansniffrm;
|
||||
msg->msglen = sizeof(p80211msg_lnxind_wlansniffrm_t);
|
||||
strcpy(msg->devname, wlandev->name);
|
||||
|
||||
msg->hosttime.did = DIDmsg_lnxind_wlansniffrm_hosttime;
|
||||
msg->hosttime.status = 0;
|
||||
msg->hosttime.len = 4;
|
||||
msg->hosttime.data = jiffies;
|
||||
|
||||
msg->mactime.did = DIDmsg_lnxind_wlansniffrm_mactime;
|
||||
msg->mactime.status = 0;
|
||||
msg->mactime.len = 4;
|
||||
msg->mactime.data = rxdesc->time;
|
||||
|
||||
msg->channel.did = DIDmsg_lnxind_wlansniffrm_channel;
|
||||
msg->channel.status = 0;
|
||||
msg->channel.len = 4;
|
||||
msg->channel.data = hw->sniff_channel;
|
||||
|
||||
msg->rssi.did = DIDmsg_lnxind_wlansniffrm_rssi;
|
||||
msg->rssi.status = P80211ENUM_msgitem_status_no_value;
|
||||
msg->rssi.len = 4;
|
||||
msg->rssi.data = 0;
|
||||
|
||||
msg->sq.did = DIDmsg_lnxind_wlansniffrm_sq;
|
||||
msg->sq.status = P80211ENUM_msgitem_status_no_value;
|
||||
msg->sq.len = 4;
|
||||
msg->sq.data = 0;
|
||||
|
||||
msg->signal.did = DIDmsg_lnxind_wlansniffrm_signal;
|
||||
msg->signal.status = 0;
|
||||
msg->signal.len = 4;
|
||||
msg->signal.data = rxdesc->signal;
|
||||
|
||||
msg->noise.did = DIDmsg_lnxind_wlansniffrm_noise;
|
||||
msg->noise.status = 0;
|
||||
msg->noise.len = 4;
|
||||
msg->noise.data = rxdesc->silence;
|
||||
|
||||
msg->rate.did = DIDmsg_lnxind_wlansniffrm_rate;
|
||||
msg->rate.status = 0;
|
||||
msg->rate.len = 4;
|
||||
msg->rate.data = rxdesc->rate / 5; /* set to 802.11 units */
|
||||
|
||||
msg->istx.did = DIDmsg_lnxind_wlansniffrm_istx;
|
||||
msg->istx.status = 0;
|
||||
msg->istx.len = 4;
|
||||
msg->istx.data = P80211ENUM_truth_false;
|
||||
|
||||
msg->frmlen.did = DIDmsg_lnxind_wlansniffrm_frmlen;
|
||||
msg->frmlen.status = 0;
|
||||
msg->frmlen.len = 4;
|
||||
msg->frmlen.data = hdrlen + datalen + WLAN_CRC_LEN;
|
||||
} else if ((wlandev->netdev->type == ARPHRD_IEEE80211_PRISM) &&
|
||||
(hw->sniffhdr != 0)) {
|
||||
p80211_caphdr_t *caphdr;
|
||||
/* The NEW header format! */
|
||||
datap = skb_put(skb, sizeof(p80211_caphdr_t));
|
||||
caphdr = (p80211_caphdr_t*) datap;
|
||||
|
||||
msg->rssi.did = DIDmsg_lnxind_wlansniffrm_rssi;
|
||||
msg->rssi.status = P80211ENUM_msgitem_status_no_value;
|
||||
msg->rssi.len = 4;
|
||||
msg->rssi.data = 0;
|
||||
|
||||
msg->sq.did = DIDmsg_lnxind_wlansniffrm_sq;
|
||||
msg->sq.status = P80211ENUM_msgitem_status_no_value;
|
||||
msg->sq.len = 4;
|
||||
msg->sq.data = 0;
|
||||
|
||||
msg->signal.did = DIDmsg_lnxind_wlansniffrm_signal;
|
||||
msg->signal.status = 0;
|
||||
msg->signal.len = 4;
|
||||
msg->signal.data = rxdesc->signal;
|
||||
|
||||
msg->noise.did = DIDmsg_lnxind_wlansniffrm_noise;
|
||||
msg->noise.status = 0;
|
||||
msg->noise.len = 4;
|
||||
msg->noise.data = rxdesc->silence;
|
||||
|
||||
msg->rate.did = DIDmsg_lnxind_wlansniffrm_rate;
|
||||
msg->rate.status = 0;
|
||||
msg->rate.len = 4;
|
||||
msg->rate.data = rxdesc->rate / 5; /* set to 802.11 units */
|
||||
|
||||
msg->istx.did = DIDmsg_lnxind_wlansniffrm_istx;
|
||||
msg->istx.status = 0;
|
||||
msg->istx.len = 4;
|
||||
msg->istx.data = P80211ENUM_truth_false;
|
||||
|
||||
msg->frmlen.did = DIDmsg_lnxind_wlansniffrm_frmlen;
|
||||
msg->frmlen.status = 0;
|
||||
msg->frmlen.len = 4;
|
||||
msg->frmlen.data = hdrlen + datalen + WLAN_CRC_LEN;
|
||||
}
|
||||
caphdr->version = htonl(P80211CAPTURE_VERSION);
|
||||
caphdr->length = htonl(sizeof(p80211_caphdr_t));
|
||||
caphdr->mactime = __cpu_to_be64(hfa384x2host_32(rxdesc->time));
|
||||
caphdr->hosttime = __cpu_to_be64(jiffies);
|
||||
caphdr->phytype = htonl(4); /* dss_dot11_b */
|
||||
caphdr->channel = htonl(hw->sniff_channel);
|
||||
caphdr->datarate = htonl(rxdesc->rate);
|
||||
caphdr->antenna = htonl(0); /* unknown */
|
||||
caphdr->priority = htonl(0); /* unknown */
|
||||
caphdr->ssi_type = htonl(3); /* rssi_raw */
|
||||
caphdr->ssi_signal = htonl(rxdesc->signal);
|
||||
caphdr->ssi_noise = htonl(rxdesc->silence);
|
||||
caphdr->preamble = htonl(0); /* unknown */
|
||||
caphdr->encoding = htonl(1); /* cck */
|
||||
}
|
||||
|
||||
/* Copy the 802.11 header to the skb (ctl frames may be less than a full header) */
|
||||
datap = skb_put(skb, hdrlen);
|
||||
|
|
|
|||
Loading…
Reference in New Issue