Skip to content

L
linux
Commit cbec30c4 authored by Solomon Peachy's avatar Solomon Peachy Committed by Greg Kroah-Hartman
Browse files
Options

Staging: wlan-ng: Delete a large pile of now-unused code. 

Signed-off-by: default avatarSolomon Peachy <pizza@shaftnet.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent aec6a5f0
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 2097 deletions
drivers/staging/wlan-ng/hfa384x.h
View file @ cbec30c4
......@@ -2742,10 +2742,6 @@ hfa384x_cmd_transmit(hfa384x_t *hw, u16 reclaim, u16 qos, u16 fid);
int
hfa384x_cmd_clearpersist(hfa384x_t *hw, u16 fid);
int
hfa384x_cmd_notify(hfa384x_t *hw, u16 reclaim, u16 fid, void *buf, u16 len);
int
hfa384x_cmd_inquire(hfa384x_t *hw, u16 fid);
int
hfa384x_cmd_access(hfa384x_t *hw, u16 write, u16 rid, void *buf, u16 len);
int
hfa384x_cmd_monitor(hfa384x_t *hw, u16 enable);
......
drivers/staging/wlan-ng/hfa384x_usb.c
View file @ cbec30c4
......@@ -584,7 +584,7 @@ hfa384x_usb_defer(struct work_struct *data)
/* Resume transmitting. */
if ( test_and_clear_bit(WORK_TX_RESUME, &hw->usb_flags) ) {
p80211netdev_wake_queue(hw->wlandev);
netif_wake_queue(hw->wlandev->netdev);
}
DBFEXIT;
......@@ -1237,95 +1237,6 @@ int hfa384x_cmd_enable(hfa384x_t *hw, u16 macport)
return result;
}
/*----------------------------------------------------------------
* hfa384x_cmd_notify
*
* Sends an info frame to the firmware to alter the behavior
* of the f/w asynch processes. Can only be called when the MAC
* is in the enabled state.
*
* Arguments:
* hw device structure
* reclaim [0|1] indicates whether the given FID will
* be handed back (via Alloc event) for reuse.
* (host order)
* fid FID of buffer containing the frame that was
* previously copied to MAC memory via the bap.
* (host order)
*
* Returns:
* 0 success
* >0 f/w reported failure - f/w status code
* <0 driver reported error (timeout|bad arg)
*
* Side effects:
* hw->resp0 will contain the FID being used by async notify
* process. If reclaim==0, resp0 will be the same as the fid
* argument. If reclaim==1, resp0 will be the different.
*
* Call context:
* process
----------------------------------------------------------------*/
int hfa384x_cmd_notify(hfa384x_t *hw, u16 reclaim, u16 fid,
void *buf, u16 len)
{
#if 0
int result = 0;
u16 cmd;
DBFENTER;
cmd = HFA384x_CMD_CMDCODE_SET(HFA384x_CMDCODE_NOTIFY) |
HFA384x_CMD_RECL_SET(reclaim);
result = hfa384x_docmd_wait(hw, cmd);
DBFEXIT;
return result;
#endif
return 0;
}
#if 0
/*----------------------------------------------------------------
* hfa384x_cmd_inquiry
*
* Requests an info frame from the firmware. The info frame will
* be delivered asynchronously via the Info event.
*
* Arguments:
* hw device structure
* fid FID of the info frame requested. (host order)
*
* Returns:
* 0 success
* >0 f/w reported failure - f/w status code
* <0 driver reported error (timeout|bad arg)
*
* Side effects:
*
* Call context:
* process
----------------------------------------------------------------*/
int hfa384x_cmd_inquiry(hfa384x_t *hw, u16 fid)
{
int result = 0;
hfa384x_metacmd_t cmd;
DBFENTER;
cmd.cmd = HFA384x_CMD_CMDCODE_SET(HFA384x_CMDCODE_INQ);
cmd.parm0 = 0;
cmd.parm1 = 0;
cmd.parm2 = 0;
result = hfa384x_docmd_wait(hw, &cmd);
DBFEXIT;
return result;
}
#endif
/*----------------------------------------------------------------
* hfa384x_cmd_monitor
*
......@@ -2687,88 +2598,6 @@ int hfa384x_drvr_low_level(hfa384x_t *hw, hfa384x_metacmd_t *cmd)
return result;
}
/*----------------------------------------------------------------
* hfa384x_drvr_mmi_read
*
* Read mmi registers. mmi is intersil-speak for the baseband
* processor registers.
*
* Arguments:
* hw device structure
* register The test register to be accessed (must be even #).
*
* Returns:
* 0 success
* >0 f/w reported error - f/w status code
* <0 driver reported error
*
* Side effects:
*
* Call context:
* process
----------------------------------------------------------------*/
int hfa384x_drvr_mmi_read(hfa384x_t *hw, u32 addr, u32 *resp)
{
#if 0
int result = 0;
u16 cmd_code = (u16) 0x30;
u16 param = (u16) addr;
DBFENTER;
/* Do i need a host2hfa... conversion ? */
result = hfa384x_docmd_wait(hw, cmd_code);
DBFEXIT;
return result;
#endif
return 0;
}
/*----------------------------------------------------------------
* hfa384x_drvr_mmi_write
*
* Read mmi registers. mmi is intersil-speak for the baseband
* processor registers.
*
* Arguments:
* hw device structure
* addr The test register to be accessed (must be even #).
* data The data value to write to the register.
*
* Returns:
* 0 success
* >0 f/w reported error - f/w status code
* <0 driver reported error
*
* Side effects:
*
* Call context:
* process
----------------------------------------------------------------*/
int
hfa384x_drvr_mmi_write(hfa384x_t *hw, u32 addr, u32 data)
{
#if 0
int result = 0;
u16 cmd_code = (u16) 0x31;
u16 param0 = (u16) addr;
u16 param1 = (u16) data;
DBFENTER;
WLAN_LOG_DEBUG(1,"mmi write : addr = 0x%08lx\n", addr);
WLAN_LOG_DEBUG(1,"mmi write : data = 0x%08lx\n", data);
/* Do i need a host2hfa... conversion ? */
result = hfa384x_docmd_wait(hw, cmd_code);
DBFEXIT;
return result;
#endif
return 0;
}
/*----------------------------------------------------------------
* hfa384x_drvr_ramdl_disable
*
......@@ -4178,7 +4007,6 @@ static void hfa384x_int_rxmonitor( wlandevice_t *wlandev, hfa384x_usb_rxfrm_t *r
unsigned int hdrlen = 0;
unsigned int datalen = 0;
unsigned int skblen = 0;
p80211msg_lnxind_wlansniffrm_t *msg;
u8 *datap;
u16 fc;
struct sk_buff *skb;
......@@ -4193,15 +4021,15 @@ static void hfa384x_int_rxmonitor( wlandevice_t *wlandev, hfa384x_usb_rxfrm_t *r
datalen = hfa384x2host_16(rxdesc->data_len);
/* Allocate an ind message+framesize skb */
skblen = sizeof(p80211msg_lnxind_wlansniffrm_t) +
skblen = sizeof(p80211_caphdr_t) +
hdrlen + datalen + WLAN_CRC_LEN;
/* sanity check the length */
if ( skblen >
(sizeof(p80211msg_lnxind_wlansniffrm_t) +
WLAN_HDR_A4_LEN + WLAN_DATA_MAXLEN + WLAN_CRC_LEN) ) {
(sizeof(p80211_caphdr_t) +
WLAN_HDR_A4_LEN + WLAN_DATA_MAXLEN + WLAN_CRC_LEN) ) {
WLAN_LOG_DEBUG(1, "overlen frm: len=%zd\n",
skblen - sizeof(p80211msg_lnxind_wlansniffrm_t));
skblen - sizeof(p80211_caphdr_t));
}
if ( (skb = dev_alloc_skb(skblen)) == NULL ) {
......@@ -4211,66 +4039,7 @@ 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) &&
(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;
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)) {
(hw->sniffhdr != 0)) {
p80211_caphdr_t *caphdr;
/* The NEW header format! */
datap = skb_put(skb, sizeof(p80211_caphdr_t));
......
drivers/staging/wlan-ng/p80211metadef.h
View file @ cbec30c4
......@@ -282,52 +282,6 @@
(P80211DID_MKSECTION(1) | \
P80211DID_MKGROUP(5) | \
P80211DID_MKITEM(40) | 0x00000000)
#define DIDmsg_dot11req_associate \
(P80211DID_MKSECTION(1) | \
P80211DID_MKGROUP(9))
#define DIDmsg_dot11req_associate_peerstaaddress \
(P80211DID_MKSECTION(1) | \
P80211DID_MKGROUP(9) | \
P80211DID_MKITEM(1) | 0x00000000)
#define DIDmsg_dot11req_associate_associatefailuretimeout \
(P80211DID_MKSECTION(1) | \
P80211DID_MKGROUP(9) | \
P80211DID_MKITEM(2) | 0x00000000)
#define DIDmsg_dot11req_associate_cfpollable \
(P80211DID_MKSECTION(1) | \
P80211DID_MKGROUP(9) | \
P80211DID_MKITEM(3) | 0x00000000)
#define DIDmsg_dot11req_associate_cfpollreq \
(P80211DID_MKSECTION(1) | \
P80211DID_MKGROUP(9) | \
P80211DID_MKITEM(4) | 0x00000000)
#define DIDmsg_dot11req_associate_privacy \
(P80211DID_MKSECTION(1) | \
P80211DID_MKGROUP(9) | \
P80211DID_MKITEM(5) | 0x00000000)
#define DIDmsg_dot11req_associate_listeninterval \
(P80211DID_MKSECTION(1) | \
P80211DID_MKGROUP(9) | \
P80211DID_MKITEM(6) | 0x00000000)
#define DIDmsg_dot11req_associate_resultcode \
(P80211DID_MKSECTION(1) | \
P80211DID_MKGROUP(9) | \
P80211DID_MKITEM(7) | 0x00000000)
#define DIDmsg_dot11req_reset \
(P80211DID_MKSECTION(1) | \
P80211DID_MKGROUP(12))
#define DIDmsg_dot11req_reset_setdefaultmib \
(P80211DID_MKSECTION(1) | \
P80211DID_MKGROUP(12) | \
P80211DID_MKITEM(1) | 0x00000000)
#define DIDmsg_dot11req_reset_macaddress \
(P80211DID_MKSECTION(1) | \
P80211DID_MKGROUP(12) | \
P80211DID_MKITEM(2) | 0x00000000)
#define DIDmsg_dot11req_reset_resultcode \
(P80211DID_MKSECTION(1) | \
P80211DID_MKGROUP(12) | \
P80211DID_MKITEM(3) | 0x00000000)
#define DIDmsg_dot11req_start \
(P80211DID_MKSECTION(1) | \
P80211DID_MKGROUP(13))
......@@ -617,147 +571,8 @@
(P80211DID_MKSECTION(3) | \
P80211DID_MKGROUP(5) | \
P80211DID_MKITEM(3) | 0x00000000)
#define DIDmsg_cat_lnxind \
P80211DID_MKSECTION(4)
#define DIDmsg_lnxind_wlansniffrm \
(P80211DID_MKSECTION(4) | \
P80211DID_MKGROUP(1))
#define DIDmsg_lnxind_wlansniffrm_hosttime \
(P80211DID_MKSECTION(4) | \
P80211DID_MKGROUP(1) | \
P80211DID_MKITEM(1) | 0x00000000)
#define DIDmsg_lnxind_wlansniffrm_mactime \
(P80211DID_MKSECTION(4) | \
P80211DID_MKGROUP(1) | \
P80211DID_MKITEM(2) | 0x00000000)
#define DIDmsg_lnxind_wlansniffrm_channel \
(P80211DID_MKSECTION(4) | \
P80211DID_MKGROUP(1) | \
P80211DID_MKITEM(3) | 0x00000000)
#define DIDmsg_lnxind_wlansniffrm_rssi \
(P80211DID_MKSECTION(4) | \
P80211DID_MKGROUP(1) | \
P80211DID_MKITEM(4) | 0x00000000)
#define DIDmsg_lnxind_wlansniffrm_sq \
(P80211DID_MKSECTION(4) | \
P80211DID_MKGROUP(1) | \
P80211DID_MKITEM(5) | 0x00000000)
#define DIDmsg_lnxind_wlansniffrm_signal \
(P80211DID_MKSECTION(4) | \
P80211DID_MKGROUP(1) | \
P80211DID_MKITEM(6) | 0x00000000)
#define DIDmsg_lnxind_wlansniffrm_noise \
(P80211DID_MKSECTION(4) | \
P80211DID_MKGROUP(1) | \
P80211DID_MKITEM(7) | 0x00000000)
#define DIDmsg_lnxind_wlansniffrm_rate \
(P80211DID_MKSECTION(4) | \
P80211DID_MKGROUP(1) | \
P80211DID_MKITEM(8) | 0x00000000)
#define DIDmsg_lnxind_wlansniffrm_istx \
(P80211DID_MKSECTION(4) | \
P80211DID_MKGROUP(1) | \
P80211DID_MKITEM(9) | 0x00000000)
#define DIDmsg_lnxind_wlansniffrm_frmlen \
(P80211DID_MKSECTION(4) | \
P80211DID_MKGROUP(1) | \
P80211DID_MKITEM(10) | 0x00000000)
#define DIDmsg_lnxind_roam \
(P80211DID_MKSECTION(4) | \
P80211DID_MKGROUP(2))
#define DIDmsg_lnxind_roam_reason \
(P80211DID_MKSECTION(4) | \
P80211DID_MKGROUP(2) | \
P80211DID_MKITEM(1) | 0x00000000)
#define DIDmsg_cat_p2req \
P80211DID_MKSECTION(5)
#define DIDmsg_p2req_join \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(1))
#define DIDmsg_p2req_join_bssid \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(1) | \
P80211DID_MKITEM(1) | 0x00000000)
#define DIDmsg_p2req_join_basicrate1 \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(1) | \
P80211DID_MKITEM(2) | 0x00000000)
#define DIDmsg_p2req_join_basicrate2 \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(1) | \
P80211DID_MKITEM(3) | 0x00000000)
#define DIDmsg_p2req_join_basicrate3 \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(1) | \
P80211DID_MKITEM(4) | 0x00000000)
#define DIDmsg_p2req_join_basicrate4 \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(1) | \
P80211DID_MKITEM(5) | 0x00000000)
#define DIDmsg_p2req_join_basicrate5 \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(1) | \
P80211DID_MKITEM(6) | 0x00000000)
#define DIDmsg_p2req_join_basicrate6 \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(1) | \
P80211DID_MKITEM(7) | 0x00000000)
#define DIDmsg_p2req_join_basicrate7 \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(1) | \
P80211DID_MKITEM(8) | 0x00000000)
#define DIDmsg_p2req_join_basicrate8 \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(1) | \
P80211DID_MKITEM(9) | 0x00000000)
#define DIDmsg_p2req_join_operationalrate1 \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(1) | \
P80211DID_MKITEM(10) | 0x00000000)
#define DIDmsg_p2req_join_operationalrate2 \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(1) | \
P80211DID_MKITEM(11) | 0x00000000)
#define DIDmsg_p2req_join_operationalrate3 \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(1) | \
P80211DID_MKITEM(12) | 0x00000000)
#define DIDmsg_p2req_join_operationalrate4 \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(1) | \
P80211DID_MKITEM(13) | 0x00000000)
#define DIDmsg_p2req_join_operationalrate5 \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(1) | \
P80211DID_MKITEM(14) | 0x00000000)
#define DIDmsg_p2req_join_operationalrate6 \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(1) | \
P80211DID_MKITEM(15) | 0x00000000)
#define DIDmsg_p2req_join_operationalrate7 \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(1) | \
P80211DID_MKITEM(16) | 0x00000000)
#define DIDmsg_p2req_join_operationalrate8 \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(1) | \
P80211DID_MKITEM(17) | 0x00000000)
#define DIDmsg_p2req_join_ssid \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(1) | \
P80211DID_MKITEM(18) | 0x00000000)
#define DIDmsg_p2req_join_channel \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(1) | \
P80211DID_MKITEM(19) | 0x00000000)
#define DIDmsg_p2req_join_authtype \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(1) | \
P80211DID_MKITEM(20) | 0x00000000)
#define DIDmsg_p2req_join_resultcode \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(1) | \
P80211DID_MKITEM(21) | 0x00000000)
#define DIDmsg_p2req_readpda \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(2))
......@@ -769,162 +584,6 @@
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(2) | \
P80211DID_MKITEM(2) | 0x00000000)
#define DIDmsg_p2req_readcis \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(3))
#define DIDmsg_p2req_readcis_cis \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(3) | \
P80211DID_MKITEM(1) | 0x00000000)
#define DIDmsg_p2req_readcis_resultcode \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(3) | \
P80211DID_MKITEM(2) | 0x00000000)
#define DIDmsg_p2req_auxport_state \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(4))
#define DIDmsg_p2req_auxport_state_enable \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(4) | \
P80211DID_MKITEM(1) | 0x00000000)
#define DIDmsg_p2req_auxport_state_resultcode \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(4) | \
P80211DID_MKITEM(2) | 0x00000000)
#define DIDmsg_p2req_auxport_read \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(5))
#define DIDmsg_p2req_auxport_read_addr \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(5) | \
P80211DID_MKITEM(1) | 0x00000000)
#define DIDmsg_p2req_auxport_read_len \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(5) | \
P80211DID_MKITEM(2) | 0x00000000)
#define DIDmsg_p2req_auxport_read_data \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(5) | \
P80211DID_MKITEM(3) | 0x00000000)
#define DIDmsg_p2req_auxport_read_resultcode \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(5) | \
P80211DID_MKITEM(4) | 0x00000000)
#define DIDmsg_p2req_auxport_write \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(6))
#define DIDmsg_p2req_auxport_write_addr \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(6) | \
P80211DID_MKITEM(1) | 0x00000000)
#define DIDmsg_p2req_auxport_write_len \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(6) | \
P80211DID_MKITEM(2) | 0x00000000)
#define DIDmsg_p2req_auxport_write_data \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(6) | \
P80211DID_MKITEM(3) | 0x00000000)
#define DIDmsg_p2req_auxport_write_resultcode \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(6) | \
P80211DID_MKITEM(4) | 0x00000000)
#define DIDmsg_p2req_low_level \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(7))
#define DIDmsg_p2req_low_level_command \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(7) | \
P80211DID_MKITEM(1) | 0x00000000)
#define DIDmsg_p2req_low_level_param0 \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(7) | \
P80211DID_MKITEM(2) | 0x00000000)
#define DIDmsg_p2req_low_level_param1 \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(7) | \
P80211DID_MKITEM(3) | 0x00000000)
#define DIDmsg_p2req_low_level_param2 \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(7) | \
P80211DID_MKITEM(4) | 0x00000000)
#define DIDmsg_p2req_low_level_resp0 \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(7) | \
P80211DID_MKITEM(5) | 0x00000000)
#define DIDmsg_p2req_low_level_resp1 \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(7) | \
P80211DID_MKITEM(6) | 0x00000000)
#define DIDmsg_p2req_low_level_resp2 \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(7) | \
P80211DID_MKITEM(7) | 0x00000000)
#define DIDmsg_p2req_low_level_resultcode \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(7) | \
P80211DID_MKITEM(8) | 0x00000000)
#define DIDmsg_p2req_test_command \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(8))
#define DIDmsg_p2req_test_command_testcode \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(8) | \
P80211DID_MKITEM(1) | 0x00000000)
#define DIDmsg_p2req_test_command_testparam \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(8) | \
P80211DID_MKITEM(2) | 0x00000000)
#define DIDmsg_p2req_test_command_resultcode \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(8) | \
P80211DID_MKITEM(3) | 0x00000000)
#define DIDmsg_p2req_test_command_status \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(8) | \
P80211DID_MKITEM(4) | 0x00000000)
#define DIDmsg_p2req_test_command_resp0 \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(8) | \
P80211DID_MKITEM(5) | 0x00000000)
#define DIDmsg_p2req_test_command_resp1 \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(8) | \
P80211DID_MKITEM(6) | 0x00000000)
#define DIDmsg_p2req_test_command_resp2 \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(8) | \
P80211DID_MKITEM(7) | 0x00000000)
#define DIDmsg_p2req_mmi_read \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(9))
#define DIDmsg_p2req_mmi_read_addr \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(9) | \
P80211DID_MKITEM(1) | 0x00000000)
#define DIDmsg_p2req_mmi_read_value \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(9) | \
P80211DID_MKITEM(2) | 0x00000000)
#define DIDmsg_p2req_mmi_read_resultcode \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(9) | \
P80211DID_MKITEM(3) | 0x00000000)
#define DIDmsg_p2req_mmi_write \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(10))
#define DIDmsg_p2req_mmi_write_addr \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(10) | \
P80211DID_MKITEM(1) | 0x00000000)
#define DIDmsg_p2req_mmi_write_data \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(10) | \
P80211DID_MKITEM(2) | 0x00000000)
#define DIDmsg_p2req_mmi_write_resultcode \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(10) | \
P80211DID_MKITEM(3) | 0x00000000)
#define DIDmsg_p2req_ramdl_state \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(11))
......@@ -989,28 +648,6 @@
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(14) | \
P80211DID_MKITEM(4) | 0x00000000)
#define DIDmsg_p2req_mm_state \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(15))
#define DIDmsg_p2req_mm_state_enable \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(15) | \
P80211DID_MKITEM(1) | 0x00000000)
#define DIDmsg_p2req_mm_state_resultcode \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(15) | \
P80211DID_MKITEM(2) | 0x00000000)
#define DIDmsg_p2req_dump_state \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(16))
#define DIDmsg_p2req_dump_state_level \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(16) | \
P80211DID_MKITEM(1) | 0x00000000)
#define DIDmsg_p2req_dump_state_resultcode \
(P80211DID_MKSECTION(5) | \
P80211DID_MKGROUP(16) | \
P80211DID_MKITEM(2) | 0x00000000)
#define DIDmib_cat_dot11smt \
P80211DID_MKSECTION(1)
#define DIDmib_dot11smt_p80211Table \
......@@ -1307,137 +944,6 @@
(P80211DID_MKSECTION(2) | \
P80211DID_MKGROUP(2) | \
P80211DID_MKITEM(14) | 0x10000000)
#define DIDmib_dot11mac_dot11GroupAddressesTable \
(P80211DID_MKSECTION(2) | \
P80211DID_MKGROUP(3))
#define DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address1 \
(P80211DID_MKSECTION(2) | \
P80211DID_MKGROUP(3) | \
P80211DID_MKITEM(1) | 0x1c000000)
#define DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address2 \
(P80211DID_MKSECTION(2) | \
P80211DID_MKGROUP(3) | \
P80211DID_MKITEM(2) | 0x1c000000)
#define DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address3 \
(P80211DID_MKSECTION(2) | \
P80211DID_MKGROUP(3) | \
P80211DID_MKITEM(3) | 0x1c000000)
#define DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address4 \
(P80211DID_MKSECTION(2) | \
P80211DID_MKGROUP(3) | \
P80211DID_MKITEM(4) | 0x1c000000)
#define DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address5 \
(P80211DID_MKSECTION(2) | \
P80211DID_MKGROUP(3) | \
P80211DID_MKITEM(5) | 0x1c000000)
#define DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address6 \
(P80211DID_MKSECTION(2) | \
P80211DID_MKGROUP(3) | \
P80211DID_MKITEM(6) | 0x1c000000)
#define DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address7 \
(P80211DID_MKSECTION(2) | \
P80211DID_MKGROUP(3) | \
P80211DID_MKITEM(7) | 0x1c000000)
#define DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address8 \
(P80211DID_MKSECTION(2) | \
P80211DID_MKGROUP(3) | \
P80211DID_MKITEM(8) | 0x1c000000)
#define DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address9 \
(P80211DID_MKSECTION(2) | \
P80211DID_MKGROUP(3) | \
P80211DID_MKITEM(9) | 0x1c000000)
#define DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address10 \
(P80211DID_MKSECTION(2) | \
P80211DID_MKGROUP(3) | \
P80211DID_MKITEM(10) | 0x1c000000)
#define DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address11 \
(P80211DID_MKSECTION(2) | \
P80211DID_MKGROUP(3) | \
P80211DID_MKITEM(11) | 0x1c000000)
#define DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address12 \
(P80211DID_MKSECTION(2) | \
P80211DID_MKGROUP(3) | \
P80211DID_MKITEM(12) | 0x1c000000)
#define DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address13 \
(P80211DID_MKSECTION(2) | \
P80211DID_MKGROUP(3) | \
P80211DID_MKITEM(13) | 0x1c000000)
#define DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address14 \
(P80211DID_MKSECTION(2) | \
P80211DID_MKGROUP(3) | \
P80211DID_MKITEM(14) | 0x1c000000)
#define DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address15 \
(P80211DID_MKSECTION(2) | \
P80211DID_MKGROUP(3) | \
P80211DID_MKITEM(15) | 0x1c000000)
#define DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address16 \
(P80211DID_MKSECTION(2) | \
P80211DID_MKGROUP(3) | \
P80211DID_MKITEM(16) | 0x1c000000)
#define DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address17 \
(P80211DID_MKSECTION(2) | \
P80211DID_MKGROUP(3) | \
P80211DID_MKITEM(17) | 0x1c000000)
#define DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address18 \
(P80211DID_MKSECTION(2) | \
P80211DID_MKGROUP(3) | \
P80211DID_MKITEM(18) | 0x1c000000)
#define DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address19 \
(P80211DID_MKSECTION(2) | \
P80211DID_MKGROUP(3) | \
P80211DID_MKITEM(19) | 0x1c000000)
#define DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address20 \
(P80211DID_MKSECTION(2) | \
P80211DID_MKGROUP(3) | \
P80211DID_MKITEM(20) | 0x1c000000)
#define DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address21 \
(P80211DID_MKSECTION(2) | \
P80211DID_MKGROUP(3) | \
P80211DID_MKITEM(21) | 0x1c000000)
#define DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address22 \
(P80211DID_MKSECTION(2) | \
P80211DID_MKGROUP(3) | \
P80211DID_MKITEM(22) | 0x1c000000)
#define DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address23 \
(P80211DID_MKSECTION(2) | \
P80211DID_MKGROUP(3) | \
P80211DID_MKITEM(23) | 0x1c000000)
#define DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address24 \
(P80211DID_MKSECTION(2) | \
P80211DID_MKGROUP(3) | \
P80211DID_MKITEM(24) | 0x1c000000)
#define DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address25 \
(P80211DID_MKSECTION(2) | \
P80211DID_MKGROUP(3) | \
P80211DID_MKITEM(25) | 0x1c000000)
#define DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address26 \
(P80211DID_MKSECTION(2) | \
P80211DID_MKGROUP(3) | \
P80211DID_MKITEM(26) | 0x1c000000)
#define DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address27 \
(P80211DID_MKSECTION(2) | \
P80211DID_MKGROUP(3) | \
P80211DID_MKITEM(27) | 0x1c000000)
#define DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address28 \
(P80211DID_MKSECTION(2) | \
P80211DID_MKGROUP(3) | \
P80211DID_MKITEM(28) | 0x1c000000)
#define DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address29 \
(P80211DID_MKSECTION(2) | \
P80211DID_MKGROUP(3) | \
P80211DID_MKITEM(29) | 0x1c000000)
#define DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address30 \
(P80211DID_MKSECTION(2) | \
P80211DID_MKGROUP(3) | \
P80211DID_MKITEM(30) | 0x1c000000)
#define DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address31 \
(P80211DID_MKSECTION(2) | \
P80211DID_MKGROUP(3) | \
P80211DID_MKITEM(31) | 0x1c000000)
#define DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address32 \
(P80211DID_MKSECTION(2) | \
P80211DID_MKGROUP(3) | \
P80211DID_MKITEM(32) | 0x1c000000)
#define DIDmib_cat_dot11phy \
P80211DID_MKSECTION(3)
#define DIDmib_dot11phy_dot11PhyOperationTable \
......
drivers/staging/wlan-ng/p80211metastruct.h
View file @ cbec30c4
......@@ -136,33 +136,6 @@ typedef struct p80211msg_dot11req_scan_results
p80211item_uint32_t supprate8 ;
} __WLAN_ATTRIB_PACK__ p80211msg_dot11req_scan_results_t;
typedef struct p80211msg_dot11req_associate
{
u32 msgcode ;
u32 msglen ;
u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_pstr6_t peerstaaddress ;
u8 pad_8C[1] ;
p80211item_uint32_t associatefailuretimeout ;
p80211item_uint32_t cfpollable ;
p80211item_uint32_t cfpollreq ;
p80211item_uint32_t privacy ;
p80211item_uint32_t listeninterval ;
p80211item_uint32_t resultcode ;
} __WLAN_ATTRIB_PACK__ p80211msg_dot11req_associate_t;
typedef struct p80211msg_dot11req_reset
{
u32 msgcode ;
u32 msglen ;
u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_uint32_t setdefaultmib ;
p80211item_pstr6_t macaddress ;
u8 pad_11C[1] ;
p80211item_uint32_t resultcode ;
} __WLAN_ATTRIB_PACK__ p80211msg_dot11req_reset_t;
typedef struct p80211msg_dot11req_start
{
u32 msgcode ;
......@@ -202,58 +175,6 @@ typedef struct p80211msg_dot11req_start
p80211item_uint32_t resultcode ;
} __WLAN_ATTRIB_PACK__ p80211msg_dot11req_start_t;
typedef struct p80211msg_dot11ind_authenticate
{
u32 msgcode ;
u32 msglen ;
u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_pstr6_t peerstaaddress ;
u8 pad_13C[1] ;
p80211item_uint32_t authenticationtype ;
} __WLAN_ATTRIB_PACK__ p80211msg_dot11ind_authenticate_t;
typedef struct p80211msg_dot11ind_deauthenticate
{
u32 msgcode ;
u32 msglen ;
u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_pstr6_t peerstaaddress ;
u8 pad_14C[1] ;
p80211item_uint32_t reasoncode ;
} __WLAN_ATTRIB_PACK__ p80211msg_dot11ind_deauthenticate_t;
typedef struct p80211msg_dot11ind_associate
{
u32 msgcode ;
u32 msglen ;
u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_pstr6_t peerstaaddress ;
u8 pad_15C[1] ;
p80211item_uint32_t aid ;
} __WLAN_ATTRIB_PACK__ p80211msg_dot11ind_associate_t;
typedef struct p80211msg_dot11ind_reassociate
{
u32 msgcode ;
u32 msglen ;
u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_pstr6_t peerstaaddress ;
u8 pad_16C[1] ;
p80211item_uint32_t aid ;
p80211item_pstr6_t oldapaddress ;
u8 pad_17C[1] ;
} __WLAN_ATTRIB_PACK__ p80211msg_dot11ind_reassociate_t;
typedef struct p80211msg_dot11ind_disassociate
{
u32 msgcode ;
u32 msglen ;
u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_pstr6_t peerstaaddress ;
u8 pad_18C[1] ;
p80211item_uint32_t reasoncode ;
} __WLAN_ATTRIB_PACK__ p80211msg_dot11ind_disassociate_t;
typedef struct p80211msg_lnxreq_ifstate
{
u32 msgcode ;
......@@ -311,61 +232,6 @@ typedef struct p80211msg_lnxreq_autojoin
p80211item_uint32_t resultcode ;
} __WLAN_ATTRIB_PACK__ p80211msg_lnxreq_autojoin_t;
typedef struct p80211msg_lnxind_wlansniffrm
{
u32 msgcode ;
u32 msglen ;
u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_uint32_t hosttime ;
p80211item_uint32_t mactime ;
p80211item_uint32_t channel ;
p80211item_uint32_t rssi ;
p80211item_uint32_t sq ;
p80211item_uint32_t signal ;
p80211item_uint32_t noise ;
p80211item_uint32_t rate ;
p80211item_uint32_t istx ;
p80211item_uint32_t frmlen ;
} __WLAN_ATTRIB_PACK__ p80211msg_lnxind_wlansniffrm_t;
typedef struct p80211msg_lnxind_roam
{
u32 msgcode ;
u32 msglen ;
u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_uint32_t reason ;
} __WLAN_ATTRIB_PACK__ p80211msg_lnxind_roam_t;
typedef struct p80211msg_p2req_join
{
u32 msgcode ;
u32 msglen ;
u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_pstr6_t bssid ;
u8 pad_20C[1] ;
p80211item_uint32_t basicrate1 ;
p80211item_uint32_t basicrate2 ;
p80211item_uint32_t basicrate3 ;
p80211item_uint32_t basicrate4 ;
p80211item_uint32_t basicrate5 ;
p80211item_uint32_t basicrate6 ;
p80211item_uint32_t basicrate7 ;
p80211item_uint32_t basicrate8 ;
p80211item_uint32_t operationalrate1 ;
p80211item_uint32_t operationalrate2 ;
p80211item_uint32_t operationalrate3 ;
p80211item_uint32_t operationalrate4 ;
p80211item_uint32_t operationalrate5 ;
p80211item_uint32_t operationalrate6 ;
p80211item_uint32_t operationalrate7 ;
p80211item_uint32_t operationalrate8 ;
p80211item_pstr32_t ssid ;
u8 pad_21D[3] ;
p80211item_uint32_t channel ;
p80211item_uint32_t authtype ;
p80211item_uint32_t resultcode ;
} __WLAN_ATTRIB_PACK__ p80211msg_p2req_join_t;
typedef struct p80211msg_p2req_readpda
{
u32 msgcode ;
......@@ -375,95 +241,6 @@ typedef struct p80211msg_p2req_readpda
p80211item_uint32_t resultcode ;
} __WLAN_ATTRIB_PACK__ p80211msg_p2req_readpda_t;
typedef struct p80211msg_p2req_readcis
{
u32 msgcode ;
u32 msglen ;
u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_unk1024_t cis ;
p80211item_uint32_t resultcode ;
} __WLAN_ATTRIB_PACK__ p80211msg_p2req_readcis_t;
typedef struct p80211msg_p2req_auxport_state
{
u32 msgcode ;
u32 msglen ;
u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_uint32_t enable ;
p80211item_uint32_t resultcode ;
} __WLAN_ATTRIB_PACK__ p80211msg_p2req_auxport_state_t;
typedef struct p80211msg_p2req_auxport_read
{
u32 msgcode ;
u32 msglen ;
u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_uint32_t addr ;
p80211item_uint32_t len ;
p80211item_unk1024_t data ;
p80211item_uint32_t resultcode ;
} __WLAN_ATTRIB_PACK__ p80211msg_p2req_auxport_read_t;
typedef struct p80211msg_p2req_auxport_write
{
u32 msgcode ;
u32 msglen ;
u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_uint32_t addr ;
p80211item_uint32_t len ;
p80211item_unk1024_t data ;
p80211item_uint32_t resultcode ;
} __WLAN_ATTRIB_PACK__ p80211msg_p2req_auxport_write_t;
typedef struct p80211msg_p2req_low_level
{
u32 msgcode ;
u32 msglen ;
u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_uint32_t command ;
p80211item_uint32_t param0 ;
p80211item_uint32_t param1 ;
p80211item_uint32_t param2 ;
p80211item_uint32_t resp0 ;
p80211item_uint32_t resp1 ;
p80211item_uint32_t resp2 ;
p80211item_uint32_t resultcode ;
} __WLAN_ATTRIB_PACK__ p80211msg_p2req_low_level_t;
typedef struct p80211msg_p2req_test_command
{
u32 msgcode ;
u32 msglen ;
u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_uint32_t testcode ;
p80211item_uint32_t testparam ;
p80211item_uint32_t resultcode ;
p80211item_uint32_t status ;
p80211item_uint32_t resp0 ;
p80211item_uint32_t resp1 ;
p80211item_uint32_t resp2 ;
} __WLAN_ATTRIB_PACK__ p80211msg_p2req_test_command_t;
typedef struct p80211msg_p2req_mmi_read
{
u32 msgcode ;
u32 msglen ;
u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_uint32_t addr ;
p80211item_uint32_t value ;
p80211item_uint32_t resultcode ;
} __WLAN_ATTRIB_PACK__ p80211msg_p2req_mmi_read_t;
typedef struct p80211msg_p2req_mmi_write
{
u32 msgcode ;
u32 msglen ;
u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_uint32_t addr ;
p80211item_uint32_t data ;
p80211item_uint32_t resultcode ;
} __WLAN_ATTRIB_PACK__ p80211msg_p2req_mmi_write_t;
typedef struct p80211msg_p2req_ramdl_state
{
u32 msgcode ;
......@@ -505,22 +282,4 @@ typedef struct p80211msg_p2req_flashdl_write
p80211item_uint32_t resultcode ;
} __WLAN_ATTRIB_PACK__ p80211msg_p2req_flashdl_write_t;
typedef struct p80211msg_p2req_mm_state
{
u32 msgcode ;
u32 msglen ;
u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_uint32_t enable ;
p80211item_uint32_t resultcode ;
} __WLAN_ATTRIB_PACK__ p80211msg_p2req_mm_state_t;
typedef struct p80211msg_p2req_dump_state
{
u32 msgcode ;
u32 msglen ;
u8 devname[WLAN_DEVNAMELEN_MAX] ;
p80211item_uint32_t level ;
p80211item_uint32_t resultcode ;
} __WLAN_ATTRIB_PACK__ p80211msg_p2req_dump_state_t;
#endif
drivers/staging/wlan-ng/p80211mod.c
View file @ cbec30c4
......@@ -188,8 +188,6 @@ EXPORT_SYMBOL(p80211netdev_rx);
EXPORT_SYMBOL(unregister_wlandev);
EXPORT_SYMBOL(wlan_setup);
EXPORT_SYMBOL(wlan_unsetup);
EXPORT_SYMBOL(p80211_suspend);
EXPORT_SYMBOL(p80211_resume);
EXPORT_SYMBOL(p80211skb_free);
EXPORT_SYMBOL(p80211skb_rxmeta_attach);
......
drivers/staging/wlan-ng/p80211netdev.c
View file @ cbec30c4
......@@ -255,7 +255,7 @@ static int p80211knetdev_open( netdevice_t *netdev )
if ( wlandev->open != NULL) {
result = wlandev->open(wlandev);
if ( result == 0 ) {
p80211netdev_start_queue(wlandev);
netif_start_queue(wlandev->netdev);
wlandev->state = WLAN_DEVICE_OPEN;
}
} else {
......@@ -290,7 +290,7 @@ static int p80211knetdev_stop( netdevice_t *netdev )
result = wlandev->close(wlandev);
}
p80211netdev_stop_queue(wlandev);
netif_stop_queue(wlandev->netdev);
wlandev->state = WLAN_DEVICE_CLOSED;
DBFEXIT;
......@@ -465,7 +465,7 @@ static int p80211knetdev_hard_start_xmit( struct sk_buff *skb, netdevice_t *netd
* TODO: we need a saner way to handle this
*/
if(skb->protocol != ETH_P_80211_RAW) {
p80211netdev_start_queue(wlandev);
netif_start_queue(wlandev->netdev);
WLAN_LOG_NOTICE(
"Tx attempt prior to association, frame dropped.\n");
wlandev->linux_stats.tx_dropped++;
......@@ -509,7 +509,7 @@ static int p80211knetdev_hard_start_xmit( struct sk_buff *skb, netdevice_t *netd
if ( txresult == 0) {
/* success and more buf */
/* avail, re: hw_txdata */
p80211netdev_wake_queue(wlandev);
netif_wake_queue(wlandev->netdev);
result = 0;
} else if ( txresult == 1 ) {
/* success, no more avail */
......@@ -1043,7 +1043,7 @@ void p80211netdev_hwremoved(wlandevice_t *wlandev)
DBFENTER;
wlandev->hwremoved = 1;
if ( wlandev->state == WLAN_DEVICE_OPEN) {
p80211netdev_stop_queue(wlandev);
netif_stop_queue(wlandev->netdev);
}
netif_device_detach(wlandev->netdev);
......@@ -1232,21 +1232,6 @@ static int p80211_rx_typedrop( wlandevice_t *wlandev, u16 fc)
return drop;
}
void p80211_suspend(wlandevice_t *wlandev)
{
DBFENTER;
DBFEXIT;
}
void p80211_resume(wlandevice_t *wlandev)
{
DBFENTER;
DBFEXIT;
}
static void p80211knetdev_tx_timeout( netdevice_t *netdev)
{
wlandevice_t *wlandev = netdev->ml_priv;
......@@ -1257,7 +1242,7 @@ static void p80211knetdev_tx_timeout( netdevice_t *netdev)
} else {
WLAN_LOG_WARNING("Implement tx_timeout for %s\n",
wlandev->nsdname);
p80211netdev_wake_queue(wlandev);
netif_wake_queue(wlandev->netdev);
}
DBFEXIT;
......
drivers/staging/wlan-ng/p80211netdev.h
View file @ cbec30c4
......@@ -243,12 +243,6 @@ int wep_change_key(wlandevice_t *wlandev, int keynum, u8* key, int keylen);
int wep_decrypt(wlandevice_t *wlandev, u8 *buf, u32 len, int key_override, u8 *iv, u8 *icv);
int wep_encrypt(wlandevice_t *wlandev, u8 *buf, u8 *dst, u32 len, int keynum, u8 *iv, u8 *icv);
/*================================================================*/
/* Externs */
/*================================================================*/
/* Function Declarations */
void p80211netdev_startup(void);
void p80211netdev_shutdown(void);
int wlan_setup(wlandevice_t *wlandev);
......@@ -257,34 +251,5 @@ int register_wlandev(wlandevice_t *wlandev);
int unregister_wlandev(wlandevice_t *wlandev);
void p80211netdev_rx(wlandevice_t *wlandev, struct sk_buff *skb);
void p80211netdev_hwremoved(wlandevice_t *wlandev);
void p80211_suspend(wlandevice_t *wlandev);
void p80211_resume(wlandevice_t *wlandev);
/*================================================================*/
/* Function Definitions */
static inline void
p80211netdev_stop_queue(wlandevice_t *wlandev)
{
if ( !wlandev ) return;
if ( !wlandev->netdev ) return;
netif_stop_queue(wlandev->netdev);
}
static inline void
p80211netdev_start_queue(wlandevice_t *wlandev)
{
if ( !wlandev ) return;
if ( !wlandev->netdev ) return;
netif_start_queue(wlandev->netdev);
}
static inline void
p80211netdev_wake_queue(wlandevice_t *wlandev)
{
if ( !wlandev ) return;
if ( !wlandev->netdev ) return;
netif_wake_queue(wlandev->netdev);
}
#endif
drivers/staging/wlan-ng/prism2mgmt.c
View file @ cbec30c4
......@@ -507,301 +507,6 @@ int prism2mgmt_scan_results(wlandevice_t *wlandev, void *msgp)
return result;
}
/*----------------------------------------------------------------
* prism2mgmt_p2_join
*
* Join a specific BSS
*
* Arguments:
* wlandev wlan device structure
* msgp ptr to msg buffer
*
* Returns:
* 0 success and done
* <0 success, but we're waiting for something to finish.
* >0 an error occurred while handling the message.
* Side effects:
*
* Call context:
* process thread (usually)
* interrupt
----------------------------------------------------------------*/
int prism2mgmt_p2_join(wlandevice_t *wlandev, void *msgp)
{
int result = 0;
hfa384x_t *hw = wlandev->priv;
p80211msg_p2req_join_t *msg = msgp;
u16 reg;
p80211pstrd_t *pstr;
u8 bytebuf[256];
hfa384x_bytestr_t *p2bytestr = (hfa384x_bytestr_t*)bytebuf;
hfa384x_JoinRequest_data_t joinreq;
DBFENTER;
wlandev->macmode = WLAN_MACMODE_NONE;
/* Set the PortType */
msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
msg->resultcode.data = P80211ENUM_resultcode_success;
/* ess port */
result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFPORTTYPE, 1);
if ( result ) {
WLAN_LOG_ERROR("Failed to set Port Type\n");
goto failed;
}
/* Set the auth type */
if ( msg->authtype.data == P80211ENUM_authalg_sharedkey ) {
reg = HFA384x_CNFAUTHENTICATION_SHAREDKEY;
} else {
reg = HFA384x_CNFAUTHENTICATION_OPENSYSTEM;
}
result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFAUTHENTICATION, reg);
if ( result ) {
WLAN_LOG_ERROR("Failed to set Authentication\n");
goto failed;
}
/* Turn off all roaming */
hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFROAMINGMODE, 3);
if ( result ) {
WLAN_LOG_ERROR("Failed to Turn off Roaming\n");
goto failed;
}
/* Basic rates */
reg = 0;
if ( msg->basicrate1.status == P80211ENUM_msgitem_status_data_ok ) {
reg = p80211rate_to_p2bit(msg->basicrate1.data);
}
if ( msg->basicrate2.status == P80211ENUM_msgitem_status_data_ok ) {
reg |= p80211rate_to_p2bit(msg->basicrate2.data);
}
if ( msg->basicrate3.status == P80211ENUM_msgitem_status_data_ok ) {
reg |= p80211rate_to_p2bit(msg->basicrate3.data);
}
if ( msg->basicrate4.status == P80211ENUM_msgitem_status_data_ok ) {
reg |= p80211rate_to_p2bit(msg->basicrate4.data);
}
if ( msg->basicrate5.status == P80211ENUM_msgitem_status_data_ok ) {
reg |= p80211rate_to_p2bit(msg->basicrate5.data);
}
if ( msg->basicrate6.status == P80211ENUM_msgitem_status_data_ok ) {
reg |= p80211rate_to_p2bit(msg->basicrate6.data);
}
if ( msg->basicrate7.status == P80211ENUM_msgitem_status_data_ok ) {
reg |= p80211rate_to_p2bit(msg->basicrate7.data);
}
if ( msg->basicrate8.status == P80211ENUM_msgitem_status_data_ok ) {
reg |= p80211rate_to_p2bit(msg->basicrate8.data);
}
if( reg == 0)
reg = 0x03;
result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFBASICRATES, reg);
if ( result ) {
WLAN_LOG_ERROR("Failed to set basicrates=%d.\n", reg);
goto failed;
}
/* Operational rates (supprates and txratecontrol) */
reg = 0;
if ( msg->operationalrate1.status == P80211ENUM_msgitem_status_data_ok ) {
reg = p80211rate_to_p2bit(msg->operationalrate1.data);
}
if ( msg->operationalrate2.status == P80211ENUM_msgitem_status_data_ok ) {
reg |= p80211rate_to_p2bit(msg->operationalrate2.data);
}
if ( msg->operationalrate3.status == P80211ENUM_msgitem_status_data_ok ) {
reg |= p80211rate_to_p2bit(msg->operationalrate3.data);
}
if ( msg->operationalrate4.status == P80211ENUM_msgitem_status_data_ok ) {
reg |= p80211rate_to_p2bit(msg->operationalrate4.data);
}
if ( msg->operationalrate5.status == P80211ENUM_msgitem_status_data_ok ) {
reg |= p80211rate_to_p2bit(msg->operationalrate5.data);
}
if ( msg->operationalrate6.status == P80211ENUM_msgitem_status_data_ok ) {
reg |= p80211rate_to_p2bit(msg->operationalrate6.data);
}
if ( msg->operationalrate7.status == P80211ENUM_msgitem_status_data_ok ) {
reg |= p80211rate_to_p2bit(msg->operationalrate7.data);
}
if ( msg->operationalrate8.status == P80211ENUM_msgitem_status_data_ok ) {
reg |= p80211rate_to_p2bit(msg->operationalrate8.data);
}
if( reg == 0)
reg = 0x0f;
result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFSUPPRATES, reg);
if ( result ) {
WLAN_LOG_ERROR("Failed to set supprates=%d.\n", reg);
goto failed;
}
result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_TXRATECNTL, reg);
if ( result ) {
WLAN_LOG_ERROR("Failed to set txrates=%d.\n", reg);
goto failed;
}
/* Set the ssid */
memset(bytebuf, 0, 256);
pstr = (p80211pstrd_t*)&(msg->ssid.data);
prism2mgmt_pstr2bytestr(p2bytestr, pstr);
result = hfa384x_drvr_setconfig(
hw, HFA384x_RID_CNFDESIREDSSID,
bytebuf, HFA384x_RID_CNFDESIREDSSID_LEN);
if ( result ) {
WLAN_LOG_ERROR("Failed to set SSID\n");
goto failed;
}
/* Enable the Port */
result = hfa384x_cmd_enable(hw, 0);
if ( result ) {
WLAN_LOG_ERROR("Enable macport failed, result=%d.\n", result);
goto failed;
}
/* Fill in the join request */
joinreq.channel = msg->channel.data;
memcpy( joinreq.bssid, ((unsigned char *) &msg->bssid.data) + 1, WLAN_BSSID_LEN);
hw->joinreq = joinreq;
hw->join_ap = 1;
/* Send the join request */
result = hfa384x_drvr_setconfig( hw,
HFA384x_RID_JOINREQUEST,
&joinreq, HFA384x_RID_JOINREQUEST_LEN);
if(result != 0) {
WLAN_LOG_ERROR("Join request failed, result=%d.\n", result);
goto failed;
}
goto done;
failed:
WLAN_LOG_DEBUG(1, "Failed to set a config option, result=%d\n", result);
msg->resultcode.data = P80211ENUM_resultcode_invalid_parameters;
done:
result = 0;
DBFEXIT;
return result;
}
/*----------------------------------------------------------------
* prism2mgmt_associate
*
* Associate with an ESS.
*
* Arguments:
* wlandev wlan device structure
* msgp ptr to msg buffer
*
* Returns:
* 0 success and done
* <0 success, but we're waiting for something to finish.
* >0 an error occurred while handling the message.
* Side effects:
*
* Call context:
* process thread (usually)
* interrupt
----------------------------------------------------------------*/
int prism2mgmt_associate(wlandevice_t *wlandev, void *msgp)
{
hfa384x_t *hw = wlandev->priv;
int result = 0;
p80211msg_dot11req_associate_t *msg = msgp;
DBFENTER;
#if 0
/* Set the TxRates */
reg = 0x000f;
hfa384x_drvr_setconfig16(hw, HFA384x_RID_TXRATECNTL, reg);
#endif
/* Set the PortType */
/* ess port */
hfa384x_drvr_setconfig16(hw, HFA384x_RID_CNFPORTTYPE, 1);
/* Enable the Port */
hfa384x_drvr_enable(hw, 0);
/* Set the resultcode */
msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
msg->resultcode.data = P80211ENUM_resultcode_success;
DBFEXIT;
return result;
}
/*----------------------------------------------------------------
* prism2mgmt_reset
*
* Reset the MAC and MSD. The p80211 layer has it's own handling
* that should be done before and after this function.
* Procedure:
* - disable system interrupts ??
* - disable MAC interrupts
* - restore system interrupts
* - issue the MAC initialize command
* - clear any MSD level state (including timers, queued events,
* etc.). Note that if we're removing timer'd/queue events, we may
* need to have remained in the system interrupt disabled state.
* We should be left in the same state that we're in following
* driver initialization.
*
* Arguments:
* wlandev wlan device structure
* msgp ptr to msg buffer, MAY BE NULL! for a driver local
* call.
*
* Returns:
* 0 success and done
* <0 success, but we're waiting for something to finish.
* >0 an error occurred while handling the message.
* Side effects:
*
* Call context:
* process thread, commonly wlanctl, but might be rmmod/pci_close.
----------------------------------------------------------------*/
int prism2mgmt_reset(wlandevice_t *wlandev, void *msgp)
{
int result = 0;
hfa384x_t *hw = wlandev->priv;
p80211msg_dot11req_reset_t *msg = msgp;
DBFENTER;
/*
* This is supported on both AP and STA and it's not allowed
* to fail.
*/
if ( msgp ) {
msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
msg->resultcode.data = P80211ENUM_resultcode_success;
WLAN_LOG_INFO("dot11req_reset: the macaddress and "
"setdefaultmib arguments are currently unsupported.\n");
}
/*
* If we got this far, the MSD must be in the MSDRUNNING state
* therefore, we must stop and then restart the hw/MAC combo.
*/
hfa384x_drvr_stop(hw);
result = hfa384x_drvr_start(hw);
if (result != 0) {
WLAN_LOG_ERROR("dot11req_reset: Initialize command failed,"
" bad things will happen from here.\n");
return 0;
}
DBFEXIT;
return 0;
}
/*----------------------------------------------------------------
* prism2mgmt_start
*
......@@ -1046,322 +751,6 @@ int prism2mgmt_readpda(wlandevice_t *wlandev, void *msgp)
return 0;
}
/*----------------------------------------------------------------
* prism2mgmt_readcis
*
* Collect the CIS data and put it in the message.
*
* Arguments:
* wlandev wlan device structure
* msgp ptr to msg buffer
*
* Returns:
* 0 success and done
* <0 success, but we're waiting for something to finish.
* >0 an error occurred while handling the message.
* Side effects:
*
* Call context:
* process thread (usually)
----------------------------------------------------------------*/
int prism2mgmt_readcis(wlandevice_t *wlandev, void *msgp)
{
int result;
hfa384x_t *hw = wlandev->priv;
p80211msg_p2req_readcis_t *msg = msgp;
DBFENTER;
memset(msg->cis.data, 0, sizeof(msg->cis.data));
result = hfa384x_drvr_getconfig(hw, HFA384x_RID_CIS,
msg->cis.data, HFA384x_RID_CIS_LEN);
if ( result ) {
WLAN_LOG_INFO("prism2mgmt_readcis: read(cis) failed.\n");
msg->cis.status = P80211ENUM_msgitem_status_no_value;
msg->resultcode.data = P80211ENUM_resultcode_implementation_failure;
}
else {
msg->cis.status = P80211ENUM_msgitem_status_data_ok;
msg->resultcode.data = P80211ENUM_resultcode_success;
}
msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
DBFEXIT;
return 0;
}
/*----------------------------------------------------------------
* prism2mgmt_auxport_state
*
* Enables/Disables the card's auxiliary port. Should be called
* before and after a sequence of auxport_read()/auxport_write()
* calls.
*
* Arguments:
* wlandev wlan device structure
* msgp ptr to msg buffer
*
* Returns:
* 0 success and done
* <0 success, but we're waiting for something to finish.
* >0 an error occurred while handling the message.
* Side effects:
*
* Call context:
* process thread (usually)
----------------------------------------------------------------*/
int prism2mgmt_auxport_state(wlandevice_t *wlandev, void *msgp)
{
p80211msg_p2req_auxport_state_t *msg = msgp;
DBFENTER;
msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
msg->resultcode.data = P80211ENUM_resultcode_not_supported;
DBFEXIT;
return 0;
}
/*----------------------------------------------------------------
* prism2mgmt_auxport_read
*
* Copies data from the card using the auxport. The auxport must
* have previously been enabled. Note: this is not the way to
* do downloads, see the [ram|flash]dl functions.
*
* Arguments:
* wlandev wlan device structure
* msgp ptr to msg buffer
*
* Returns:
* 0 success and done
* <0 success, but we're waiting for something to finish.
* >0 an error occurred while handling the message.
* Side effects:
*
* Call context:
* process thread (usually)
----------------------------------------------------------------*/
int prism2mgmt_auxport_read(wlandevice_t *wlandev, void *msgp)
{
DBFENTER;
WLAN_LOG_ERROR("prism2mgmt_auxport_read: Not supported on USB.\n");
DBFEXIT;
return 0;
}
/*----------------------------------------------------------------
* prism2mgmt_auxport_write
*
* Copies data to the card using the auxport. The auxport must
* have previously been enabled. Note: this is not the way to
* do downloads, see the [ram|flash]dl functions.
*
* Arguments:
* wlandev wlan device structure
* msgp ptr to msg buffer
*
* Returns:
* 0 success and done
* <0 success, but we're waiting for something to finish.
* >0 an error occurred while handling the message.
* Side effects:
*
* Call context:
* process thread (usually)
----------------------------------------------------------------*/
int prism2mgmt_auxport_write(wlandevice_t *wlandev, void *msgp)
{
DBFENTER;
WLAN_LOG_ERROR("prism2mgmt_auxport_read: Not supported on USB.\n");
DBFEXIT;
return 0;
}
/*----------------------------------------------------------------
* prism2mgmt_low_level
*
* Puts the card into the desired test mode.
*
* Arguments:
* wlandev wlan device structure
* msgp ptr to msg buffer
*
* Returns:
* 0 success and done
* <0 success, but we're waiting for something to finish.
* >0 an error occurred while handling the message.
* Side effects:
*
* Call context:
* process thread (usually)
----------------------------------------------------------------*/
int prism2mgmt_low_level(wlandevice_t *wlandev, void *msgp)
{
hfa384x_t *hw = wlandev->priv;
p80211msg_p2req_low_level_t *msg = msgp;
hfa384x_metacmd_t cmd;
DBFENTER;
msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
/* call some routine to execute the test command */
cmd.cmd = (u16) msg->command.data;
cmd.parm0 = (u16) msg->param0.data;
cmd.parm1 = (u16) msg->param1.data;
cmd.parm2 = (u16) msg->param2.data;
hfa384x_drvr_low_level(hw,&cmd);
msg->resp0.data = (u32) cmd.result.resp0;
msg->resp1.data = (u32) cmd.result.resp1;
msg->resp2.data = (u32) cmd.result.resp2;
msg->resultcode.data = P80211ENUM_resultcode_success;
DBFEXIT;
return 0;
}
/*----------------------------------------------------------------
* prism2mgmt_test_command
*
* Puts the card into the desired test mode.
*
* Arguments:
* wlandev wlan device structure
* msgp ptr to msg buffer
*
* Returns:
* 0 success and done
* <0 success, but we're waiting for something to finish.
* >0 an error occurred while handling the message.
* Side effects:
*
* Call context:
* process thread (usually)
----------------------------------------------------------------*/
int prism2mgmt_test_command(wlandevice_t *wlandev, void *msgp)
{
hfa384x_t *hw = wlandev->priv;
p80211msg_p2req_test_command_t *msg = msgp;
hfa384x_metacmd_t cmd;
DBFENTER;
cmd.cmd = ((u16) msg->testcode.data) << 8 | 0x38;
cmd.parm0 = (u16) msg->testparam.data;
cmd.parm1 = 0;
cmd.parm2 = 0;
/* call some routine to execute the test command */
hfa384x_drvr_low_level(hw,&cmd);
msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
msg->resultcode.data = P80211ENUM_resultcode_success;
msg->status.status = P80211ENUM_msgitem_status_data_ok;
msg->status.data = cmd.result.status;
msg->resp0.status = P80211ENUM_msgitem_status_data_ok;
msg->resp0.data = cmd.result.resp0;
msg->resp1.status = P80211ENUM_msgitem_status_data_ok;
msg->resp1.data = cmd.result.resp1;
msg->resp2.status = P80211ENUM_msgitem_status_data_ok;
msg->resp2.data = cmd.result.resp2;
DBFEXIT;
return 0;
}
/*----------------------------------------------------------------
* prism2mgmt_mmi_read
*
* Read from one of the MMI registers.
*
* Arguments:
* wlandev wlan device structure
* msgp ptr to msg buffer
*
* Returns:
* 0 success and done
* <0 success, but we're waiting for something to finish.
* >0 an error occurred while handling the message.
* Side effects:
*
* Call context:
* process thread (usually)
----------------------------------------------------------------*/
int prism2mgmt_mmi_read(wlandevice_t *wlandev, void *msgp)
{
hfa384x_t *hw = wlandev->priv;
p80211msg_p2req_mmi_read_t *msg = msgp;
u32 resp = 0;
DBFENTER;
msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
/* call some routine to execute the test command */
hfa384x_drvr_mmi_read(hw, msg->addr.data, &resp);
/* I'm not sure if this is "architecturally" correct, but it
is expedient. */
msg->value.status = P80211ENUM_msgitem_status_data_ok;
msg->value.data = resp;
msg->resultcode.data = P80211ENUM_resultcode_success;
DBFEXIT;
return 0;
}
/*----------------------------------------------------------------
* prism2mgmt_mmi_write
*
* Write a data value to one of the MMI registers.
*
* Arguments:
* wlandev wlan device structure
* msgp ptr to msg buffer
*
* Returns:
* 0 success and done
* <0 success, but we're waiting for something to finish.
* >0 an error occurred while handling the message.
* Side effects:
*
* Call context:
* process thread (usually)
----------------------------------------------------------------*/
int prism2mgmt_mmi_write(wlandevice_t *wlandev, void *msgp)
{
hfa384x_t *hw = wlandev->priv;
p80211msg_p2req_mmi_write_t *msg = msgp;
DBFENTER;
msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
/* call some routine to execute the test command */
hfa384x_drvr_mmi_write(hw, msg->addr.data, msg->data.data);
msg->resultcode.data = P80211ENUM_resultcode_success;
DBFEXIT;
return 0;
}
/*----------------------------------------------------------------
* prism2mgmt_ramdl_state
*
......@@ -1632,42 +1021,6 @@ int prism2mgmt_flashdl_write(wlandevice_t *wlandev, void *msgp)
return 0;
}
/*----------------------------------------------------------------
* prism2mgmt_dump_state
*
* Dumps the driver's and hardware's current state via the kernel
* log at KERN_NOTICE level.
*
* Arguments:
* wlandev wlan device structure
* msgp ptr to msg buffer
*
* Returns:
* 0 success and done
* <0 success, but we're waiting for something to finish.
* >0 an error occurred while handling the message.
* Side effects:
*
* Call context:
* process thread (usually)
----------------------------------------------------------------*/
int prism2mgmt_dump_state(wlandevice_t *wlandev, void *msgp)
{
p80211msg_p2req_dump_state_t *msg = msgp;
int result = 0;
DBFENTER;
msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
msg->resultcode.data = P80211ENUM_resultcode_not_supported;
goto failed;
failed:
DBFEXIT;
return result;
}
/*----------------------------------------------------------------
* prism2mgmt_autojoin
*
......
drivers/staging/wlan-ng/prism2mgmt.h
View file @ cbec30c4
......@@ -98,30 +98,16 @@ prism2sta_ev_rx(wlandevice_t *wlandev, struct sk_buff *skb);
void
prism2sta_ev_alloc(wlandevice_t *wlandev);
int prism2mgmt_mibset_mibget(wlandevice_t *wlandev, void *msgp);
int prism2mgmt_scan(wlandevice_t *wlandev, void *msgp);
int prism2mgmt_scan_results(wlandevice_t *wlandev, void *msgp);
int prism2mgmt_p2_join(wlandevice_t *wlandev, void *msgp);
int prism2mgmt_associate(wlandevice_t *wlandev, void *msgp);
int prism2mgmt_reset(wlandevice_t *wlandev, void *msgp);
int prism2mgmt_start(wlandevice_t *wlandev, void *msgp);
int prism2mgmt_wlansniff(wlandevice_t *wlandev, void *msgp);
int prism2mgmt_readpda(wlandevice_t *wlandev, void *msgp);
int prism2mgmt_readcis(wlandevice_t *wlandev, void *msgp);
int prism2mgmt_auxport_state(wlandevice_t *wlandev, void *msgp);
int prism2mgmt_auxport_read(wlandevice_t *wlandev, void *msgp);
int prism2mgmt_auxport_write(wlandevice_t *wlandev, void *msgp);
int prism2mgmt_low_level(wlandevice_t *wlandev, void *msgp);
int prism2mgmt_test_command(wlandevice_t *wlandev, void *msgp);
int prism2mgmt_mmi_read(wlandevice_t *wlandev, void *msgp);
int prism2mgmt_mmi_write(wlandevice_t *wlandev, void *msgp);
int prism2mgmt_ramdl_state(wlandevice_t *wlandev, void *msgp);
int prism2mgmt_ramdl_write(wlandevice_t *wlandev, void *msgp);
int prism2mgmt_flashdl_state(wlandevice_t *wlandev, void *msgp);
int prism2mgmt_flashdl_write(wlandevice_t *wlandev, void *msgp);
int prism2mgmt_mm_state(wlandevice_t *wlandev, void *msgp);
int prism2mgmt_dump_state(wlandevice_t *wlandev, void *msgp);
int prism2mgmt_autojoin(wlandevice_t *wlandev, void *msgp);
/*---------------------------------------------------------------
......
drivers/staging/wlan-ng/prism2mib.c
View file @ cbec30c4
......@@ -232,14 +232,6 @@ hfa384x_t *hw,
p80211msg_dot11req_mibset_t *msg,
void *data);
static int prism2mib_groupaddress(
mibrec_t *mib,
int isget,
wlandevice_t *wlandev,
hfa384x_t *hw,
p80211msg_dot11req_mibset_t *msg,
void *data);
static int prism2mib_fwid(
mibrec_t *mib,
int isget,
......@@ -430,134 +422,6 @@ static mibrec_t mibtab[] = {
F_STA | F_READ,
HFA384x_RID_MAXRXLIFETIME, 0, 0,
prism2mib_uint32 },
{ DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address1,
F_STA | F_READ | F_WRITE,
0, 0, 0,
prism2mib_groupaddress },
{ DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address2,
F_STA | F_READ | F_WRITE,
0, 0, 0,
prism2mib_groupaddress },
{ DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address3,
F_STA | F_READ | F_WRITE,
0, 0, 0,
prism2mib_groupaddress },
{ DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address4,
F_STA | F_READ | F_WRITE,
0, 0, 0,
prism2mib_groupaddress },
{ DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address5,
F_STA | F_READ | F_WRITE,
0, 0, 0,
prism2mib_groupaddress },
{ DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address6,
F_STA | F_READ | F_WRITE,
0, 0, 0,
prism2mib_groupaddress },
{ DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address7,
F_STA | F_READ | F_WRITE,
0, 0, 0,
prism2mib_groupaddress },
{ DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address8,
F_STA | F_READ | F_WRITE,
0, 0, 0,
prism2mib_groupaddress },
{ DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address9,
F_STA | F_READ | F_WRITE,
0, 0, 0,
prism2mib_groupaddress },
{ DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address10,
F_STA | F_READ | F_WRITE,
0, 0, 0,
prism2mib_groupaddress },
{ DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address11,
F_STA | F_READ | F_WRITE,
0, 0, 0,
prism2mib_groupaddress },
{ DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address12,
F_STA | F_READ | F_WRITE,
0, 0, 0,
prism2mib_groupaddress },
{ DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address13,
F_STA | F_READ | F_WRITE,
0, 0, 0,
prism2mib_groupaddress },
{ DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address14,
F_STA | F_READ | F_WRITE,
0, 0, 0,
prism2mib_groupaddress },
{ DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address15,
F_STA | F_READ | F_WRITE,
0, 0, 0,
prism2mib_groupaddress },
{ DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address16,
F_STA | F_READ | F_WRITE,
0, 0, 0,
prism2mib_groupaddress },
{ DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address17,
F_STA | F_READ | F_WRITE,
0, 0, 0,
prism2mib_groupaddress },
{ DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address18,
F_STA | F_READ | F_WRITE,
0, 0, 0,
prism2mib_groupaddress },
{ DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address19,
F_STA | F_READ | F_WRITE,
0, 0, 0,
prism2mib_groupaddress },
{ DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address20,
F_STA | F_READ | F_WRITE,
0, 0, 0,
prism2mib_groupaddress },
{ DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address21,
F_STA | F_READ | F_WRITE,
0, 0, 0,
prism2mib_groupaddress },
{ DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address22,
F_STA | F_READ | F_WRITE,
0, 0, 0,
prism2mib_groupaddress },
{ DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address23,
F_STA | F_READ | F_WRITE,
0, 0, 0,
prism2mib_groupaddress },
{ DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address24,
F_STA | F_READ | F_WRITE,
0, 0, 0,
prism2mib_groupaddress },
{ DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address25,
F_STA | F_READ | F_WRITE,
0, 0, 0,
prism2mib_groupaddress },
{ DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address26,
F_STA | F_READ | F_WRITE,
0, 0, 0,
prism2mib_groupaddress },
{ DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address27,
F_STA | F_READ | F_WRITE,
0, 0, 0,
prism2mib_groupaddress },
{ DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address28,
F_STA | F_READ | F_WRITE,
0, 0, 0,
prism2mib_groupaddress },
{ DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address29,
F_STA | F_READ | F_WRITE,
0, 0, 0,
prism2mib_groupaddress },
{ DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address30,
F_STA | F_READ | F_WRITE,
0, 0, 0,
prism2mib_groupaddress },
{ DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address31,
F_STA | F_READ | F_WRITE,
0, 0, 0,
prism2mib_groupaddress },
{ DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address32,
F_STA | F_READ | F_WRITE,
0, 0, 0,
prism2mib_groupaddress },
/* dot11phy MIB's */
......@@ -2008,95 +1872,6 @@ void *data)
return(result);
}
/*----------------------------------------------------------------
* prism2mib_groupaddress
*
* Get/set the dot11GroupAddressesTable.
*
* MIB record parameters:
* parm1 Not used.
* parm2 Not used.
* parm3 Not used.
*
* Arguments:
* mib MIB record.
* isget MIBGET/MIBSET flag.
* wlandev wlan device structure.
* priv "priv" structure.
* hw "hw" structure.
* msg Message structure.
* data Data buffer.
*
* Returns:
* 0 - Success.
* ~0 - Error.
*
----------------------------------------------------------------*/
static int prism2mib_groupaddress(
mibrec_t *mib,
int isget,
wlandevice_t *wlandev,
hfa384x_t *hw,
p80211msg_dot11req_mibset_t *msg,
void *data)
{
int result;
p80211pstrd_t *pstr = (p80211pstrd_t *) data;
u8 bytebuf[MIB_TMP_MAXLEN];
u16 len;
DBFENTER;
/* TODO: fix this. f/w doesn't support mcast filters */
if (isget) {
prism2mgmt_get_grpaddr(mib->did, pstr, hw);
return(0);
}
result = prism2mgmt_set_grpaddr(mib->did, bytebuf, pstr, hw);
if (result != 0) {
msg->resultcode.data = P80211ENUM_resultcode_not_supported;
return(result);
}
if (hw->dot11_grpcnt <= MAX_PRISM2_GRP_ADDR) {
len = hw->dot11_grpcnt * WLAN_ADDR_LEN;
memcpy(bytebuf, hw->dot11_grp_addr[0], len);
result = hfa384x_drvr_setconfig(hw, HFA384x_RID_GROUPADDR, bytebuf, len);
/*
** Turn off promiscuous mode if count is equal to MAX. We may
** have been at a higher count in promiscuous mode and need to
** turn it off.
*/
/* but only if we're not already in promisc mode. :) */
if ((hw->dot11_grpcnt == MAX_PRISM2_GRP_ADDR) &&
!( wlandev->netdev->flags & IFF_PROMISC)) {
result = hfa384x_drvr_setconfig16(hw,
HFA384x_RID_PROMISCMODE, 0);
}
} else {
/*
** Clear group addresses in card and set to promiscuous mode.
*/
memset(bytebuf, 0, sizeof(bytebuf));
result = hfa384x_drvr_setconfig(hw, HFA384x_RID_GROUPADDR,
bytebuf, 0);
if (result == 0) {
result = hfa384x_drvr_setconfig16(hw,
HFA384x_RID_PROMISCMODE, 1);
}
}
DBFEXIT;
return(result);
}
/*----------------------------------------------------------------
* prism2mib_fwid
*
......@@ -2873,128 +2648,3 @@ int prism2mgmt_set_grpaddr(u32 did, u8 *prism2buf,
DBFEXIT;
return(0);
}
/*----------------------------------------------------------------
* prism2mgmt_get_grpaddr_index
*
* Gets the index in the group address list based on the did.
*
* Arguments:
* did mibitem did
*
* Returns:
* >= 0 If valid did
* < 0 If not valid did
*
----------------------------------------------------------------*/
int prism2mgmt_get_grpaddr_index( u32 did )
{
int index;
DBFENTER;
index = -1;
switch (did) {
case DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address1:
index = 0;
break;
case DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address2:
index = 1;
break;
case DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address3:
index = 2;
break;
case DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address4:
index = 3;
break;
case DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address5:
index = 4;
break;
case DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address6:
index = 5;
break;
case DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address7:
index = 6;
break;
case DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address8:
index = 7;
break;
case DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address9:
index = 8;
break;
case DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address10:
index = 9;
break;
case DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address11:
index = 10;
break;
case DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address12:
index = 11;
break;
case DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address13:
index = 12;
break;
case DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address14:
index = 13;
break;
case DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address15:
index = 14;
break;
case DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address16:
index = 15;
break;
case DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address17:
index = 16;
break;
case DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address18:
index = 17;
break;
case DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address19:
index = 18;
break;
case DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address20:
index = 19;
break;
case DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address21:
index = 20;
break;
case DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address22:
index = 21;
break;
case DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address23:
index = 22;
break;
case DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address24:
index = 23;
break;
case DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address25:
index = 24;
break;
case DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address26:
index = 25;
break;
case DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address27:
index = 26;
break;
case DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address28:
index = 27;
break;
case DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address29:
index = 28;
break;
case DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address30:
index = 29;
break;
case DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address31:
index = 30;
break;
case DIDmib_dot11mac_dot11GroupAddressesTable_dot11Address32:
index = 31;
break;
}
DBFEXIT;
return index;
}
drivers/staging/wlan-ng/prism2sta.c
View file @ cbec30c4
......@@ -385,14 +385,6 @@ static int prism2sta_mlmerequest(wlandevice_t *wlandev, p80211msg_t *msg)
WLAN_LOG_DEBUG(2,"Received scan_results request\n");
result = prism2mgmt_scan_results(wlandev, msg);
break;
case DIDmsg_dot11req_associate :
WLAN_LOG_DEBUG(2,"Received mlme associate request\n");
result = prism2mgmt_associate(wlandev, msg);
break;
case DIDmsg_dot11req_reset :
WLAN_LOG_DEBUG(2,"Received mlme reset request\n");
result = prism2mgmt_reset(wlandev, msg);
break;
case DIDmsg_dot11req_start :
WLAN_LOG_DEBUG(2,"Received mlme start request\n");
result = prism2mgmt_start(wlandev, msg);
......@@ -400,46 +392,10 @@ static int prism2sta_mlmerequest(wlandevice_t *wlandev, p80211msg_t *msg)
/*
* Prism2 specific messages
*/
case DIDmsg_p2req_join :
WLAN_LOG_DEBUG(2,"Received p2 join request\n");
result = prism2mgmt_p2_join(wlandev, msg);
break;
case DIDmsg_p2req_readpda :
WLAN_LOG_DEBUG(2,"Received mlme readpda request\n");
result = prism2mgmt_readpda(wlandev, msg);
break;
case DIDmsg_p2req_readcis :
WLAN_LOG_DEBUG(2,"Received mlme readcis request\n");
result = prism2mgmt_readcis(wlandev, msg);
break;
case DIDmsg_p2req_auxport_state :
WLAN_LOG_DEBUG(2,"Received mlme auxport_state request\n");
result = prism2mgmt_auxport_state(wlandev, msg);
break;
case DIDmsg_p2req_auxport_read :
WLAN_LOG_DEBUG(2,"Received mlme auxport_read request\n");
result = prism2mgmt_auxport_read(wlandev, msg);
break;
case DIDmsg_p2req_auxport_write :
WLAN_LOG_DEBUG(2,"Received mlme auxport_write request\n");
result = prism2mgmt_auxport_write(wlandev, msg);
break;
case DIDmsg_p2req_low_level :
WLAN_LOG_DEBUG(2,"Received mlme low_level request\n");
result = prism2mgmt_low_level(wlandev, msg);
break;
case DIDmsg_p2req_test_command :
WLAN_LOG_DEBUG(2,"Received mlme test_command request\n");
result = prism2mgmt_test_command(wlandev, msg);
break;
case DIDmsg_p2req_mmi_read :
WLAN_LOG_DEBUG(2,"Received mlme mmi_read request\n");
result = prism2mgmt_mmi_read(wlandev, msg);
break;
case DIDmsg_p2req_mmi_write :
WLAN_LOG_DEBUG(2,"Received mlme mmi_write request\n");
result = prism2mgmt_mmi_write(wlandev, msg);
break;
case DIDmsg_p2req_ramdl_state :
WLAN_LOG_DEBUG(2,"Received mlme ramdl_state request\n");
result = prism2mgmt_ramdl_state(wlandev, msg);
......@@ -456,10 +412,6 @@ static int prism2sta_mlmerequest(wlandevice_t *wlandev, p80211msg_t *msg)
WLAN_LOG_DEBUG(2,"Received mlme flashdl_write request\n");
result = prism2mgmt_flashdl_write(wlandev, msg);
break;
case DIDmsg_p2req_dump_state :
WLAN_LOG_DEBUG(2,"Received mlme dump_state request\n");
result = prism2mgmt_dump_state(wlandev, msg);
break;
/*
* Linux specific messages
*/
......@@ -2114,7 +2066,7 @@ void prism2sta_ev_alloc(wlandevice_t *wlandev)
{
DBFENTER;
p80211netdev_wake_queue(wlandev);
netif_wake_queue(wlandev->netdev);
DBFEXIT;
return;
......
drivers/staging/wlan-ng/wlan_compat.h
View file @ cbec30c4
......@@ -111,8 +111,6 @@
#define WLAN_LOG_INFO(args... ) printk(KERN_INFO args)
#if defined(WLAN_INCLUDE_DEBUG)
#define WLAN_ASSERT(c) if ((!(c)) && WLAN_DBVAR >= 1) { \
WLAN_LOG_DEBUG(1, "Assertion failure!\n"); }
#define WLAN_HEX_DUMP( l, x, p, n) if( WLAN_DBVAR >= (l) ){ \
int __i__; \
printk(KERN_DEBUG x ":"); \
......@@ -124,7 +122,6 @@
#define WLAN_LOG_DEBUG(l,x,args...) if ( WLAN_DBVAR >= (l)) printk(KERN_DEBUG "%s(%lu): " x , __func__, (preempt_count() & PREEMPT_MASK), ##args );
#else
#define WLAN_ASSERT(c)
#define WLAN_HEX_DUMP( l, s, p, n)
#define DBFENTER
#define DBFEXIT
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7