Skip to content

L
linux-davinci
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
Expand all 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
This diff is collapsed.
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
This diff is collapsed.
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
This diff is collapsed.
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