Skip to content

L
linux
Commit 8a251b55 authored by Moritz Muehlenhoff's avatar Moritz Muehlenhoff Committed by Greg Kroah-Hartman
Browse files
Options

Staging: wlan-ng: Remove DBFENTER/DBFEXIT macros 

Remove the ugly DBFENTER/DBFEXIT macros, which are only inserted to add "<---" and
"--->" at the function start/end at higher debug levels and which make the code
a lot less readable.
Signed-off-by: default avatarMoritz Muehlenhoff <jmm@debian.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 1f61379e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 520 deletions
drivers/staging/wlan-ng/hfa384x_usb.c
View file @ 8a251b55
This diff is collapsed.
drivers/staging/wlan-ng/p80211conv.c
View file @ 8a251b55
...@@ -140,7 +140,6 @@ int skb_ether_to_p80211( wlandevice_t *wlandev, u32 ethconv, struct sk_buff *skb ...@@ -140,7 +140,6 @@ int skb_ether_to_p80211( wlandevice_t *wlandev, u32 ethconv, struct sk_buff *skb
wlan_snap_t *e_snap; wlan_snap_t *e_snap;
int foo; int foo;
DBFENTER;
memcpy(&e_hdr, skb->data, sizeof(e_hdr)); memcpy(&e_hdr, skb->data, sizeof(e_hdr));
if (skb->len <= 0) { if (skb->len <= 0) {
...@@ -248,7 +247,6 @@ int skb_ether_to_p80211( wlandevice_t *wlandev, u32 ethconv, struct sk_buff *skb ...@@ -248,7 +247,6 @@ int skb_ether_to_p80211( wlandevice_t *wlandev, u32 ethconv, struct sk_buff *skb
p80211_hdr->a3.dur = 0; p80211_hdr->a3.dur = 0;
p80211_hdr->a3.seq = 0; p80211_hdr->a3.seq = 0;
DBFEXIT;
return 0; return 0;
} }
...@@ -308,8 +306,6 @@ int skb_p80211_to_ether( wlandevice_t *wlandev, u32 ethconv, struct sk_buff *skb ...@@ -308,8 +306,6 @@ int skb_p80211_to_ether( wlandevice_t *wlandev, u32 ethconv, struct sk_buff *skb
int foo; int foo;
DBFENTER;
payload_length = skb->len - WLAN_HDR_A3_LEN - WLAN_CRC_LEN; payload_length = skb->len - WLAN_HDR_A3_LEN - WLAN_CRC_LEN;
payload_offset = WLAN_HDR_A3_LEN; payload_offset = WLAN_HDR_A3_LEN;
...@@ -511,7 +507,6 @@ int skb_p80211_to_ether( wlandevice_t *wlandev, u32 ethconv, struct sk_buff *skb ...@@ -511,7 +507,6 @@ int skb_p80211_to_ether( wlandevice_t *wlandev, u32 ethconv, struct sk_buff *skb
/* Free the metadata */ /* Free the metadata */
p80211skb_rxmeta_detach(skb); p80211skb_rxmeta_detach(skb);
DBFEXIT;
return 0; return 0;
} }
...@@ -567,7 +562,6 @@ p80211skb_rxmeta_detach(struct sk_buff *skb) ...@@ -567,7 +562,6 @@ p80211skb_rxmeta_detach(struct sk_buff *skb)
p80211_rxmeta_t *rxmeta; p80211_rxmeta_t *rxmeta;
p80211_frmmeta_t *frmmeta; p80211_frmmeta_t *frmmeta;
DBFENTER;
/* Sanity checks */ /* Sanity checks */
if ( skb==NULL ) { /* bad skb */ if ( skb==NULL ) { /* bad skb */
WLAN_LOG_DEBUG(1, "Called w/ null skb.\n"); WLAN_LOG_DEBUG(1, "Called w/ null skb.\n");
...@@ -590,7 +584,6 @@ p80211skb_rxmeta_detach(struct sk_buff *skb) ...@@ -590,7 +584,6 @@ p80211skb_rxmeta_detach(struct sk_buff *skb)
/* Clear skb->cb */ /* Clear skb->cb */
memset(skb->cb, 0, sizeof(skb->cb)); memset(skb->cb, 0, sizeof(skb->cb));
exit: exit:
DBFEXIT;
return; return;
} }
...@@ -617,8 +610,6 @@ p80211skb_rxmeta_attach(struct wlandevice *wlandev, struct sk_buff *skb) ...@@ -617,8 +610,6 @@ p80211skb_rxmeta_attach(struct wlandevice *wlandev, struct sk_buff *skb)
p80211_rxmeta_t *rxmeta; p80211_rxmeta_t *rxmeta;
p80211_frmmeta_t *frmmeta; p80211_frmmeta_t *frmmeta;
DBFENTER;
/* If these already have metadata, we error out! */ /* If these already have metadata, we error out! */
if (P80211SKB_RXMETA(skb) != NULL) { if (P80211SKB_RXMETA(skb) != NULL) {
WLAN_LOG_ERROR("%s: RXmeta already attached!\n", WLAN_LOG_ERROR("%s: RXmeta already attached!\n",
...@@ -648,7 +639,6 @@ p80211skb_rxmeta_attach(struct wlandevice *wlandev, struct sk_buff *skb) ...@@ -648,7 +639,6 @@ p80211skb_rxmeta_attach(struct wlandevice *wlandev, struct sk_buff *skb)
frmmeta->magic = P80211_FRMMETA_MAGIC; frmmeta->magic = P80211_FRMMETA_MAGIC;
frmmeta->rx = rxmeta; frmmeta->rx = rxmeta;
exit: exit:
DBFEXIT;
return result; return result;
} }
...@@ -672,7 +662,7 @@ void ...@@ -672,7 +662,7 @@ void
p80211skb_free(struct wlandevice *wlandev, struct sk_buff *skb) p80211skb_free(struct wlandevice *wlandev, struct sk_buff *skb)
{ {
p80211_frmmeta_t *meta; p80211_frmmeta_t *meta;
DBFENTER;
meta = P80211SKB_FRMMETA(skb); meta = P80211SKB_FRMMETA(skb);
if ( meta && meta->rx) { if ( meta && meta->rx) {
p80211skb_rxmeta_detach(skb); p80211skb_rxmeta_detach(skb);
...@@ -681,6 +671,5 @@ p80211skb_free(struct wlandevice *wlandev, struct sk_buff *skb) ...@@ -681,6 +671,5 @@ p80211skb_free(struct wlandevice *wlandev, struct sk_buff *skb)
} }
dev_kfree_skb(skb); dev_kfree_skb(skb);
DBFEXIT;
return; return;
} }
drivers/staging/wlan-ng/p80211netdev.c
View file @ 8a251b55
...@@ -157,12 +157,10 @@ MODULE_PARM_DESC(wlan_debug, "p80211 debug level"); ...@@ -157,12 +157,10 @@ MODULE_PARM_DESC(wlan_debug, "p80211 debug level");
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
static int p80211knetdev_init( netdevice_t *netdev) static int p80211knetdev_init( netdevice_t *netdev)
{ {
DBFENTER;
/* Called in response to register_netdev */ /* Called in response to register_netdev */
/* This is usually the probe function, but the probe has */ /* This is usually the probe function, but the probe has */
/* already been done by the MSD and the create_kdev */ /* already been done by the MSD and the create_kdev */
/* function. All we do here is return success */ /* function. All we do here is return success */
DBFEXIT;
return 0; return 0;
} }
...@@ -185,12 +183,10 @@ static struct net_device_stats* ...@@ -185,12 +183,10 @@ static struct net_device_stats*
p80211knetdev_get_stats(netdevice_t *netdev) p80211knetdev_get_stats(netdevice_t *netdev)
{ {
wlandevice_t *wlandev = netdev->ml_priv; wlandevice_t *wlandev = netdev->ml_priv;
DBFENTER;
/* TODO: review the MIB stats for items that correspond to /* TODO: review the MIB stats for items that correspond to
linux stats */ linux stats */
DBFEXIT;
return &(wlandev->linux_stats); return &(wlandev->linux_stats);
} }
...@@ -214,8 +210,6 @@ static int p80211knetdev_open( netdevice_t *netdev ) ...@@ -214,8 +210,6 @@ static int p80211knetdev_open( netdevice_t *netdev )
int result = 0; /* success */ int result = 0; /* success */
wlandevice_t *wlandev = netdev->ml_priv; wlandevice_t *wlandev = netdev->ml_priv;
DBFENTER;
/* Check to make sure the MSD is running */ /* Check to make sure the MSD is running */
if ( wlandev->msdstate != WLAN_MSD_RUNNING ) { if ( wlandev->msdstate != WLAN_MSD_RUNNING ) {
return -ENODEV; return -ENODEV;
...@@ -232,7 +226,6 @@ static int p80211knetdev_open( netdevice_t *netdev ) ...@@ -232,7 +226,6 @@ static int p80211knetdev_open( netdevice_t *netdev )
result = -EAGAIN; result = -EAGAIN;
} }
DBFEXIT;
return result; return result;
} }
...@@ -254,8 +247,6 @@ static int p80211knetdev_stop( netdevice_t *netdev ) ...@@ -254,8 +247,6 @@ static int p80211knetdev_stop( netdevice_t *netdev )
int result = 0; int result = 0;
wlandevice_t *wlandev = netdev->ml_priv; wlandevice_t *wlandev = netdev->ml_priv;
DBFENTER;
if ( wlandev->close != NULL ) { if ( wlandev->close != NULL ) {
result = wlandev->close(wlandev); result = wlandev->close(wlandev);
} }
...@@ -263,7 +254,6 @@ static int p80211knetdev_stop( netdevice_t *netdev ) ...@@ -263,7 +254,6 @@ static int p80211knetdev_stop( netdevice_t *netdev )
netif_stop_queue(wlandev->netdev); netif_stop_queue(wlandev->netdev);
wlandev->state = WLAN_DEVICE_CLOSED; wlandev->state = WLAN_DEVICE_CLOSED;
DBFEXIT;
return result; return result;
} }
...@@ -283,14 +273,11 @@ static int p80211knetdev_stop( netdevice_t *netdev ) ...@@ -283,14 +273,11 @@ static int p80211knetdev_stop( netdevice_t *netdev )
void void
p80211netdev_rx(wlandevice_t *wlandev, struct sk_buff *skb ) p80211netdev_rx(wlandevice_t *wlandev, struct sk_buff *skb )
{ {
DBFENTER;
/* Enqueue for post-irq processing */ /* Enqueue for post-irq processing */
skb_queue_tail(&wlandev->nsd_rxq, skb); skb_queue_tail(&wlandev->nsd_rxq, skb);
tasklet_schedule(&wlandev->rx_bh); tasklet_schedule(&wlandev->rx_bh);
DBFEXIT;
return; return;
} }
...@@ -315,8 +302,6 @@ static void p80211netdev_rx_bh(unsigned long arg) ...@@ -315,8 +302,6 @@ static void p80211netdev_rx_bh(unsigned long arg)
p80211_hdr_a3_t *hdr; p80211_hdr_a3_t *hdr;
u16 fc; u16 fc;
DBFENTER;
/* Let's empty our our queue */ /* Let's empty our our queue */
while ( (skb = skb_dequeue(&wlandev->nsd_rxq)) ) { while ( (skb = skb_dequeue(&wlandev->nsd_rxq)) ) {
if (wlandev->state == WLAN_DEVICE_OPEN) { if (wlandev->state == WLAN_DEVICE_OPEN) {
...@@ -369,8 +354,6 @@ static void p80211netdev_rx_bh(unsigned long arg) ...@@ -369,8 +354,6 @@ static void p80211netdev_rx_bh(unsigned long arg)
} }
dev_kfree_skb(skb); dev_kfree_skb(skb);
} }
DBFEXIT;
} }
...@@ -401,8 +384,6 @@ static int p80211knetdev_hard_start_xmit( struct sk_buff *skb, netdevice_t *netd ...@@ -401,8 +384,6 @@ static int p80211knetdev_hard_start_xmit( struct sk_buff *skb, netdevice_t *netd
p80211_hdr_t p80211_hdr; p80211_hdr_t p80211_hdr;
p80211_metawep_t p80211_wep; p80211_metawep_t p80211_wep;
DBFENTER;
if (skb == NULL) { if (skb == NULL) {
return 0; return 0;
} }
...@@ -506,7 +487,6 @@ static int p80211knetdev_hard_start_xmit( struct sk_buff *skb, netdevice_t *netd ...@@ -506,7 +487,6 @@ static int p80211knetdev_hard_start_xmit( struct sk_buff *skb, netdevice_t *netd
if (!result) if (!result)
dev_kfree_skb(skb); dev_kfree_skb(skb);
DBFEXIT;
return result; return result;
} }
...@@ -527,14 +507,11 @@ static void p80211knetdev_set_multicast_list(netdevice_t *dev) ...@@ -527,14 +507,11 @@ static void p80211knetdev_set_multicast_list(netdevice_t *dev)
{ {
wlandevice_t *wlandev = dev->ml_priv; wlandevice_t *wlandev = dev->ml_priv;
DBFENTER;
/* TODO: real multicast support as well */ /* TODO: real multicast support as well */
if (wlandev->set_multicast_list) if (wlandev->set_multicast_list)
wlandev->set_multicast_list(wlandev, dev); wlandev->set_multicast_list(wlandev, dev);
DBFEXIT;
} }
#ifdef SIOCETHTOOL #ifdef SIOCETHTOOL
...@@ -620,7 +597,6 @@ static int p80211knetdev_do_ioctl(netdevice_t *dev, struct ifreq *ifr, int cmd) ...@@ -620,7 +597,6 @@ static int p80211knetdev_do_ioctl(netdevice_t *dev, struct ifreq *ifr, int cmd)
p80211ioctl_req_t *req = (p80211ioctl_req_t*)ifr; p80211ioctl_req_t *req = (p80211ioctl_req_t*)ifr;
wlandevice_t *wlandev = dev->ml_priv; wlandevice_t *wlandev = dev->ml_priv;
u8 *msgbuf; u8 *msgbuf;
DBFENTER;
WLAN_LOG_DEBUG(2, "rx'd ioctl, cmd=%d, len=%d\n", cmd, req->len); WLAN_LOG_DEBUG(2, "rx'd ioctl, cmd=%d, len=%d\n", cmd, req->len);
...@@ -663,8 +639,6 @@ static int p80211knetdev_do_ioctl(netdevice_t *dev, struct ifreq *ifr, int cmd) ...@@ -663,8 +639,6 @@ static int p80211knetdev_do_ioctl(netdevice_t *dev, struct ifreq *ifr, int cmd)
result = -ENOMEM; result = -ENOMEM;
} }
bail: bail:
DBFEXIT;
return result; /* If allocate,copyfrom or copyto fails, return errno */ return result; /* If allocate,copyfrom or copyto fails, return errno */
} }
...@@ -702,7 +676,6 @@ static int p80211knetdev_set_mac_address(netdevice_t *dev, void *addr) ...@@ -702,7 +676,6 @@ static int p80211knetdev_set_mac_address(netdevice_t *dev, void *addr)
p80211item_uint32_t *resultcode; p80211item_uint32_t *resultcode;
int result = 0; int result = 0;
DBFENTER;
/* If we're running, we don't allow MAC address changes */ /* If we're running, we don't allow MAC address changes */
if (netif_running(dev)) { if (netif_running(dev)) {
return -EBUSY; return -EBUSY;
...@@ -753,13 +726,11 @@ static int p80211knetdev_set_mac_address(netdevice_t *dev, void *addr) ...@@ -753,13 +726,11 @@ static int p80211knetdev_set_mac_address(netdevice_t *dev, void *addr)
memcpy(dev->dev_addr, new_addr->sa_data, dev->addr_len); memcpy(dev->dev_addr, new_addr->sa_data, dev->addr_len);
} }
DBFEXIT;
return result; return result;
} }
static int wlan_change_mtu(netdevice_t *dev, int new_mtu) static int wlan_change_mtu(netdevice_t *dev, int new_mtu)
{ {
DBFENTER;
// 2312 is max 802.11 payload, 20 is overhead, (ether + llc +snap) // 2312 is max 802.11 payload, 20 is overhead, (ether + llc +snap)
// and another 8 for wep. // and another 8 for wep.
if ( (new_mtu < 68) || (new_mtu > (2312 - 20 - 8))) if ( (new_mtu < 68) || (new_mtu > (2312 - 20 - 8)))
...@@ -767,8 +738,6 @@ static int wlan_change_mtu(netdevice_t *dev, int new_mtu) ...@@ -767,8 +738,6 @@ static int wlan_change_mtu(netdevice_t *dev, int new_mtu)
dev->mtu = new_mtu; dev->mtu = new_mtu;
DBFEXIT;
return 0; return 0;
} }
...@@ -801,8 +770,6 @@ int wlan_setup(wlandevice_t *wlandev) ...@@ -801,8 +770,6 @@ int wlan_setup(wlandevice_t *wlandev)
int result = 0; int result = 0;
netdevice_t *dev; netdevice_t *dev;
DBFENTER;
/* Set up the wlandev */ /* Set up the wlandev */
wlandev->state = WLAN_DEVICE_CLOSED; wlandev->state = WLAN_DEVICE_CLOSED;
wlandev->ethconv = WLAN_ETHCONV_8021h; wlandev->ethconv = WLAN_ETHCONV_8021h;
...@@ -853,7 +820,6 @@ int wlan_setup(wlandevice_t *wlandev) ...@@ -853,7 +820,6 @@ int wlan_setup(wlandevice_t *wlandev)
netif_carrier_off(dev); netif_carrier_off(dev);
} }
DBFEXIT;
return result; return result;
} }
...@@ -882,8 +848,6 @@ int wlan_unsetup(wlandevice_t *wlandev) ...@@ -882,8 +848,6 @@ int wlan_unsetup(wlandevice_t *wlandev)
{ {
int result = 0; int result = 0;
DBFENTER;
tasklet_kill(&wlandev->rx_bh); tasklet_kill(&wlandev->rx_bh);
if (wlandev->netdev == NULL ) { if (wlandev->netdev == NULL ) {
...@@ -894,7 +858,6 @@ int wlan_unsetup(wlandevice_t *wlandev) ...@@ -894,7 +858,6 @@ int wlan_unsetup(wlandevice_t *wlandev)
wlandev->netdev = NULL; wlandev->netdev = NULL;
} }
DBFEXIT;
return 0; return 0;
} }
...@@ -923,13 +886,10 @@ int register_wlandev(wlandevice_t *wlandev) ...@@ -923,13 +886,10 @@ int register_wlandev(wlandevice_t *wlandev)
{ {
int i = 0; int i = 0;
DBFENTER;
i = register_netdev(wlandev->netdev); i = register_netdev(wlandev->netdev);
if (i) if (i)
return i; return i;
DBFEXIT;
return 0; return 0;
} }
...@@ -955,8 +915,6 @@ int unregister_wlandev(wlandevice_t *wlandev) ...@@ -955,8 +915,6 @@ int unregister_wlandev(wlandevice_t *wlandev)
{ {
struct sk_buff *skb; struct sk_buff *skb;
DBFENTER;
unregister_netdev(wlandev->netdev); unregister_netdev(wlandev->netdev);
/* Now to clean out the rx queue */ /* Now to clean out the rx queue */
...@@ -964,7 +922,6 @@ int unregister_wlandev(wlandevice_t *wlandev) ...@@ -964,7 +922,6 @@ int unregister_wlandev(wlandevice_t *wlandev)
dev_kfree_skb(skb); dev_kfree_skb(skb);
} }
DBFEXIT;
return 0; return 0;
} }
...@@ -1001,15 +958,12 @@ int unregister_wlandev(wlandevice_t *wlandev) ...@@ -1001,15 +958,12 @@ int unregister_wlandev(wlandevice_t *wlandev)
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
void p80211netdev_hwremoved(wlandevice_t *wlandev) void p80211netdev_hwremoved(wlandevice_t *wlandev)
{ {
DBFENTER;
wlandev->hwremoved = 1; wlandev->hwremoved = 1;
if ( wlandev->state == WLAN_DEVICE_OPEN) { if ( wlandev->state == WLAN_DEVICE_OPEN) {
netif_stop_queue(wlandev->netdev); netif_stop_queue(wlandev->netdev);
} }
netif_device_detach(wlandev->netdev); netif_device_detach(wlandev->netdev);
DBFEXIT;
} }
...@@ -1196,7 +1150,6 @@ static int p80211_rx_typedrop( wlandevice_t *wlandev, u16 fc) ...@@ -1196,7 +1150,6 @@ static int p80211_rx_typedrop( wlandevice_t *wlandev, u16 fc)
static void p80211knetdev_tx_timeout( netdevice_t *netdev) static void p80211knetdev_tx_timeout( netdevice_t *netdev)
{ {
wlandevice_t *wlandev = netdev->ml_priv; wlandevice_t *wlandev = netdev->ml_priv;
DBFENTER;
if (wlandev->tx_timeout) { if (wlandev->tx_timeout) {
wlandev->tx_timeout(wlandev); wlandev->tx_timeout(wlandev);
...@@ -1205,6 +1158,4 @@ static void p80211knetdev_tx_timeout( netdevice_t *netdev) ...@@ -1205,6 +1158,4 @@ static void p80211knetdev_tx_timeout( netdevice_t *netdev)
wlandev->nsdname); wlandev->nsdname);
netif_wake_queue(wlandev->netdev); netif_wake_queue(wlandev->netdev);
} }
DBFEXIT;
} }
drivers/staging/wlan-ng/p80211req.c
View file @ 8a251b55
...@@ -129,8 +129,6 @@ int p80211req_dorequest( wlandevice_t *wlandev, u8 *msgbuf) ...@@ -129,8 +129,6 @@ int p80211req_dorequest( wlandevice_t *wlandev, u8 *msgbuf)
int result = 0; int result = 0;
p80211msg_t *msg = (p80211msg_t*)msgbuf; p80211msg_t *msg = (p80211msg_t*)msgbuf;
DBFENTER;
/* Check to make sure the MSD is running */ /* Check to make sure the MSD is running */
if ( if (
!((wlandev->msdstate == WLAN_MSD_HWPRESENT && !((wlandev->msdstate == WLAN_MSD_HWPRESENT &&
...@@ -162,7 +160,6 @@ int p80211req_dorequest( wlandevice_t *wlandev, u8 *msgbuf) ...@@ -162,7 +160,6 @@ int p80211req_dorequest( wlandevice_t *wlandev, u8 *msgbuf)
wlandev->mlmerequest(wlandev, msg); wlandev->mlmerequest(wlandev, msg);
clear_bit( 1, &(wlandev->request_pending)); clear_bit( 1, &(wlandev->request_pending));
DBFEXIT;
return result; /* if result==0, msg->status still may contain an err */ return result; /* if result==0, msg->status still may contain an err */
} }
...@@ -186,8 +183,6 @@ int p80211req_dorequest( wlandevice_t *wlandev, u8 *msgbuf) ...@@ -186,8 +183,6 @@ int p80211req_dorequest( wlandevice_t *wlandev, u8 *msgbuf)
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
static void p80211req_handlemsg( wlandevice_t *wlandev, p80211msg_t *msg) static void p80211req_handlemsg( wlandevice_t *wlandev, p80211msg_t *msg)
{ {
DBFENTER;
switch (msg->msgcode) { switch (msg->msgcode) {
case DIDmsg_lnxreq_hostwep: { case DIDmsg_lnxreq_hostwep: {
...@@ -211,8 +206,6 @@ static void p80211req_handlemsg( wlandevice_t *wlandev, p80211msg_t *msg) ...@@ -211,8 +206,6 @@ static void p80211req_handlemsg( wlandevice_t *wlandev, p80211msg_t *msg)
; ;
} /* switch msg->msgcode */ } /* switch msg->msgcode */
DBFEXIT;
return; return;
} }
...@@ -224,8 +217,6 @@ static int p80211req_mibset_mibget(wlandevice_t *wlandev, ...@@ -224,8 +217,6 @@ static int p80211req_mibset_mibget(wlandevice_t *wlandev,
p80211pstrd_t *pstr = (p80211pstrd_t*) mibitem->data; p80211pstrd_t *pstr = (p80211pstrd_t*) mibitem->data;
u8 *key = mibitem->data + sizeof(p80211pstrd_t); u8 *key = mibitem->data + sizeof(p80211pstrd_t);
DBFENTER;
switch (mibitem->did) { switch (mibitem->did) {
case DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey0: { case DIDmib_dot11smt_dot11WEPDefaultKeysTable_dot11WEPDefaultKey0: {
if (!isget) if (!isget)
...@@ -294,7 +285,6 @@ static int p80211req_mibset_mibget(wlandevice_t *wlandev, ...@@ -294,7 +285,6 @@ static int p80211req_mibset_mibget(wlandevice_t *wlandev,
; ;
} }
DBFEXIT;
return 0; return 0;
} }
drivers/staging/wlan-ng/p80211wext.c
View file @ 8a251b55
This diff is collapsed.
drivers/staging/wlan-ng/prism2mgmt.c
View file @ 8a251b55
...@@ -134,8 +134,6 @@ int prism2mgmt_scan(wlandevice_t *wlandev, void *msgp) ...@@ -134,8 +134,6 @@ int prism2mgmt_scan(wlandevice_t *wlandev, void *msgp)
hfa384x_HostScanRequest_data_t scanreq; hfa384x_HostScanRequest_data_t scanreq;
DBFENTER;
/* gatekeeper check */ /* gatekeeper check */
if (HFA384x_FIRMWARE_VERSION(hw->ident_sta_fw.major, if (HFA384x_FIRMWARE_VERSION(hw->ident_sta_fw.major,
hw->ident_sta_fw.minor, hw->ident_sta_fw.minor,
...@@ -340,7 +338,6 @@ int prism2mgmt_scan(wlandevice_t *wlandev, void *msgp) ...@@ -340,7 +338,6 @@ int prism2mgmt_scan(wlandevice_t *wlandev, void *msgp)
exit: exit:
msg->resultcode.status = P80211ENUM_msgitem_status_data_ok; msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
DBFEXIT;
return result; return result;
} }
...@@ -374,8 +371,6 @@ int prism2mgmt_scan_results(wlandevice_t *wlandev, void *msgp) ...@@ -374,8 +371,6 @@ int prism2mgmt_scan_results(wlandevice_t *wlandev, void *msgp)
int count; int count;
DBFENTER;
req = (p80211msg_dot11req_scan_results_t *) msgp; req = (p80211msg_dot11req_scan_results_t *) msgp;
req->resultcode.status = P80211ENUM_msgitem_status_data_ok; req->resultcode.status = P80211ENUM_msgitem_status_data_ok;
...@@ -502,7 +497,6 @@ int prism2mgmt_scan_results(wlandevice_t *wlandev, void *msgp) ...@@ -502,7 +497,6 @@ int prism2mgmt_scan_results(wlandevice_t *wlandev, void *msgp)
req->resultcode.data = P80211ENUM_resultcode_success; req->resultcode.data = P80211ENUM_resultcode_success;
exit: exit:
DBFEXIT;
return result; return result;
} }
...@@ -535,7 +529,6 @@ int prism2mgmt_start(wlandevice_t *wlandev, void *msgp) ...@@ -535,7 +529,6 @@ int prism2mgmt_start(wlandevice_t *wlandev, void *msgp)
u8 bytebuf[80]; u8 bytebuf[80];
hfa384x_bytestr_t *p2bytestr = (hfa384x_bytestr_t*)bytebuf; hfa384x_bytestr_t *p2bytestr = (hfa384x_bytestr_t*)bytebuf;
u16 word; u16 word;
DBFENTER;
wlandev->macmode = WLAN_MACMODE_NONE; wlandev->macmode = WLAN_MACMODE_NONE;
...@@ -681,7 +674,6 @@ int prism2mgmt_start(wlandevice_t *wlandev, void *msgp) ...@@ -681,7 +674,6 @@ int prism2mgmt_start(wlandevice_t *wlandev, void *msgp)
done: done:
result = 0; result = 0;
DBFEXIT;
return result; return result;
} }
...@@ -708,7 +700,6 @@ int prism2mgmt_readpda(wlandevice_t *wlandev, void *msgp) ...@@ -708,7 +700,6 @@ int prism2mgmt_readpda(wlandevice_t *wlandev, void *msgp)
hfa384x_t *hw = wlandev->priv; hfa384x_t *hw = wlandev->priv;
p80211msg_p2req_readpda_t *msg = msgp; p80211msg_p2req_readpda_t *msg = msgp;
int result; int result;
DBFENTER;
/* We only support collecting the PDA when in the FWLOAD /* We only support collecting the PDA when in the FWLOAD
* state. * state.
...@@ -738,7 +729,6 @@ int prism2mgmt_readpda(wlandevice_t *wlandev, void *msgp) ...@@ -738,7 +729,6 @@ int prism2mgmt_readpda(wlandevice_t *wlandev, void *msgp)
P80211ENUM_resultcode_implementation_failure; P80211ENUM_resultcode_implementation_failure;
msg->resultcode.status = msg->resultcode.status =
P80211ENUM_msgitem_status_data_ok; P80211ENUM_msgitem_status_data_ok;
DBFEXIT;
return 0; return 0;
} }
msg->pda.status = P80211ENUM_msgitem_status_data_ok; msg->pda.status = P80211ENUM_msgitem_status_data_ok;
...@@ -746,7 +736,6 @@ int prism2mgmt_readpda(wlandevice_t *wlandev, void *msgp) ...@@ -746,7 +736,6 @@ int prism2mgmt_readpda(wlandevice_t *wlandev, void *msgp)
msg->resultcode.status = P80211ENUM_msgitem_status_data_ok; msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
} }
DBFEXIT;
return 0; return 0;
} }
...@@ -779,7 +768,6 @@ int prism2mgmt_ramdl_state(wlandevice_t *wlandev, void *msgp) ...@@ -779,7 +768,6 @@ int prism2mgmt_ramdl_state(wlandevice_t *wlandev, void *msgp)
{ {
hfa384x_t *hw = wlandev->priv; hfa384x_t *hw = wlandev->priv;
p80211msg_p2req_ramdl_state_t *msg = msgp; p80211msg_p2req_ramdl_state_t *msg = msgp;
DBFENTER;
if (wlandev->msdstate != WLAN_MSD_FWLOAD) { if (wlandev->msdstate != WLAN_MSD_FWLOAD) {
WLAN_LOG_ERROR( WLAN_LOG_ERROR(
...@@ -788,7 +776,6 @@ int prism2mgmt_ramdl_state(wlandevice_t *wlandev, void *msgp) ...@@ -788,7 +776,6 @@ int prism2mgmt_ramdl_state(wlandevice_t *wlandev, void *msgp)
msg->resultcode.data = msg->resultcode.data =
P80211ENUM_resultcode_implementation_failure; P80211ENUM_resultcode_implementation_failure;
msg->resultcode.status = P80211ENUM_msgitem_status_data_ok; msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
DBFEXIT;
return 0; return 0;
} }
...@@ -809,7 +796,6 @@ int prism2mgmt_ramdl_state(wlandevice_t *wlandev, void *msgp) ...@@ -809,7 +796,6 @@ int prism2mgmt_ramdl_state(wlandevice_t *wlandev, void *msgp)
msg->resultcode.data = P80211ENUM_resultcode_success; msg->resultcode.data = P80211ENUM_resultcode_success;
} }
DBFEXIT;
return 0; return 0;
} }
...@@ -841,7 +827,6 @@ int prism2mgmt_ramdl_write(wlandevice_t *wlandev, void *msgp) ...@@ -841,7 +827,6 @@ int prism2mgmt_ramdl_write(wlandevice_t *wlandev, void *msgp)
u32 addr; u32 addr;
u32 len; u32 len;
u8 *buf; u8 *buf;
DBFENTER;
if (wlandev->msdstate != WLAN_MSD_FWLOAD) { if (wlandev->msdstate != WLAN_MSD_FWLOAD) {
WLAN_LOG_ERROR( WLAN_LOG_ERROR(
...@@ -850,7 +835,6 @@ int prism2mgmt_ramdl_write(wlandevice_t *wlandev, void *msgp) ...@@ -850,7 +835,6 @@ int prism2mgmt_ramdl_write(wlandevice_t *wlandev, void *msgp)
msg->resultcode.data = msg->resultcode.data =
P80211ENUM_resultcode_implementation_failure; P80211ENUM_resultcode_implementation_failure;
msg->resultcode.status = P80211ENUM_msgitem_status_data_ok; msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
DBFEXIT;
return 0; return 0;
} }
...@@ -870,7 +854,6 @@ int prism2mgmt_ramdl_write(wlandevice_t *wlandev, void *msgp) ...@@ -870,7 +854,6 @@ int prism2mgmt_ramdl_write(wlandevice_t *wlandev, void *msgp)
} }
msg->resultcode.data = P80211ENUM_resultcode_success; msg->resultcode.data = P80211ENUM_resultcode_success;
DBFEXIT;
return 0; return 0;
} }
...@@ -905,7 +888,6 @@ int prism2mgmt_flashdl_state(wlandevice_t *wlandev, void *msgp) ...@@ -905,7 +888,6 @@ int prism2mgmt_flashdl_state(wlandevice_t *wlandev, void *msgp)
int result = 0; int result = 0;
hfa384x_t *hw = wlandev->priv; hfa384x_t *hw = wlandev->priv;
p80211msg_p2req_flashdl_state_t *msg = msgp; p80211msg_p2req_flashdl_state_t *msg = msgp;
DBFENTER;
if (wlandev->msdstate != WLAN_MSD_FWLOAD) { if (wlandev->msdstate != WLAN_MSD_FWLOAD) {
WLAN_LOG_ERROR( WLAN_LOG_ERROR(
...@@ -914,7 +896,6 @@ int prism2mgmt_flashdl_state(wlandevice_t *wlandev, void *msgp) ...@@ -914,7 +896,6 @@ int prism2mgmt_flashdl_state(wlandevice_t *wlandev, void *msgp)
msg->resultcode.data = msg->resultcode.data =
P80211ENUM_resultcode_implementation_failure; P80211ENUM_resultcode_implementation_failure;
msg->resultcode.status = P80211ENUM_msgitem_status_data_ok; msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
DBFEXIT;
return 0; return 0;
} }
...@@ -951,7 +932,6 @@ int prism2mgmt_flashdl_state(wlandevice_t *wlandev, void *msgp) ...@@ -951,7 +932,6 @@ int prism2mgmt_flashdl_state(wlandevice_t *wlandev, void *msgp)
} }
} }
DBFEXIT;
return 0; return 0;
} }
...@@ -981,7 +961,6 @@ int prism2mgmt_flashdl_write(wlandevice_t *wlandev, void *msgp) ...@@ -981,7 +961,6 @@ int prism2mgmt_flashdl_write(wlandevice_t *wlandev, void *msgp)
u32 addr; u32 addr;
u32 len; u32 len;
u8 *buf; u8 *buf;
DBFENTER;
if (wlandev->msdstate != WLAN_MSD_FWLOAD) { if (wlandev->msdstate != WLAN_MSD_FWLOAD) {
WLAN_LOG_ERROR( WLAN_LOG_ERROR(
...@@ -990,7 +969,6 @@ int prism2mgmt_flashdl_write(wlandevice_t *wlandev, void *msgp) ...@@ -990,7 +969,6 @@ int prism2mgmt_flashdl_write(wlandevice_t *wlandev, void *msgp)
msg->resultcode.data = msg->resultcode.data =
P80211ENUM_resultcode_implementation_failure; P80211ENUM_resultcode_implementation_failure;
msg->resultcode.status = P80211ENUM_msgitem_status_data_ok; msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
DBFEXIT;
return 0; return 0;
} }
...@@ -1016,7 +994,6 @@ int prism2mgmt_flashdl_write(wlandevice_t *wlandev, void *msgp) ...@@ -1016,7 +994,6 @@ int prism2mgmt_flashdl_write(wlandevice_t *wlandev, void *msgp)
} }
msg->resultcode.data = P80211ENUM_resultcode_success; msg->resultcode.data = P80211ENUM_resultcode_success;
DBFEXIT;
return 0; return 0;
} }
...@@ -1049,7 +1026,6 @@ int prism2mgmt_autojoin(wlandevice_t *wlandev, void *msgp) ...@@ -1049,7 +1026,6 @@ int prism2mgmt_autojoin(wlandevice_t *wlandev, void *msgp)
p80211pstrd_t *pstr; p80211pstrd_t *pstr;
u8 bytebuf[256]; u8 bytebuf[256];
hfa384x_bytestr_t *p2bytestr = (hfa384x_bytestr_t*)bytebuf; hfa384x_bytestr_t *p2bytestr = (hfa384x_bytestr_t*)bytebuf;
DBFENTER;
wlandev->macmode = WLAN_MACMODE_NONE; wlandev->macmode = WLAN_MACMODE_NONE;
...@@ -1107,7 +1083,6 @@ int prism2mgmt_autojoin(wlandevice_t *wlandev, void *msgp) ...@@ -1107,7 +1083,6 @@ int prism2mgmt_autojoin(wlandevice_t *wlandev, void *msgp)
msg->resultcode.status = P80211ENUM_msgitem_status_data_ok; msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
msg->resultcode.data = P80211ENUM_resultcode_success; msg->resultcode.data = P80211ENUM_resultcode_success;
DBFEXIT;
return result; return result;
} }
...@@ -1139,8 +1114,6 @@ int prism2mgmt_wlansniff(wlandevice_t *wlandev, void *msgp) ...@@ -1139,8 +1114,6 @@ int prism2mgmt_wlansniff(wlandevice_t *wlandev, void *msgp)
hfa384x_t *hw = wlandev->priv; hfa384x_t *hw = wlandev->priv;
u16 word; u16 word;
DBFENTER;
msg->resultcode.status = P80211ENUM_msgitem_status_data_ok; msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
switch (msg->enable.data) switch (msg->enable.data)
{ {
...@@ -1357,7 +1330,5 @@ int prism2mgmt_wlansniff(wlandevice_t *wlandev, void *msgp) ...@@ -1357,7 +1330,5 @@ int prism2mgmt_wlansniff(wlandevice_t *wlandev, void *msgp)
msg->resultcode.data = P80211ENUM_resultcode_refused; msg->resultcode.data = P80211ENUM_resultcode_refused;
result = 0; result = 0;
exit: exit:
DBFEXIT;
return result; return result;
} }
drivers/staging/wlan-ng/prism2mib.c
View file @ 8a251b55
...@@ -304,8 +304,6 @@ int prism2mgmt_mibset_mibget(wlandevice_t *wlandev, void *msgp) ...@@ -304,8 +304,6 @@ int prism2mgmt_mibset_mibget(wlandevice_t *wlandev, void *msgp)
p80211msg_dot11req_mibset_t *msg = msgp; p80211msg_dot11req_mibset_t *msg = msgp;
p80211itemd_t *mibitem; p80211itemd_t *mibitem;
DBFENTER;
msg->resultcode.status = P80211ENUM_msgitem_status_data_ok; msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
msg->resultcode.data = P80211ENUM_resultcode_success; msg->resultcode.data = P80211ENUM_resultcode_success;
...@@ -383,8 +381,6 @@ int prism2mgmt_mibset_mibget(wlandevice_t *wlandev, void *msgp) ...@@ -383,8 +381,6 @@ int prism2mgmt_mibset_mibget(wlandevice_t *wlandev, void *msgp)
} }
done: done:
DBFEXIT;
return(0); return(0);
} }
...@@ -425,8 +421,6 @@ void *data) ...@@ -425,8 +421,6 @@ void *data)
p80211pstrd_t *pstr = (p80211pstrd_t*) data; p80211pstrd_t *pstr = (p80211pstrd_t*) data;
u8 bytebuf[MIB_TMP_MAXLEN]; u8 bytebuf[MIB_TMP_MAXLEN];
DBFENTER;
if (isget) { if (isget) {
result = hfa384x_drvr_getconfig(hw, mib->parm1, bytebuf, mib->parm2); result = hfa384x_drvr_getconfig(hw, mib->parm1, bytebuf, mib->parm2);
prism2mgmt_bytearea2pstr(bytebuf, pstr, mib->parm2); prism2mgmt_bytearea2pstr(bytebuf, pstr, mib->parm2);
...@@ -436,7 +430,6 @@ void *data) ...@@ -436,7 +430,6 @@ void *data)
result = hfa384x_drvr_setconfig(hw, mib->parm1, bytebuf, mib->parm2); result = hfa384x_drvr_setconfig(hw, mib->parm1, bytebuf, mib->parm2);
} }
DBFEXIT;
return(result); return(result);
} }
...@@ -478,8 +471,6 @@ void *data) ...@@ -478,8 +471,6 @@ void *data)
u8 bytebuf[MIB_TMP_MAXLEN]; u8 bytebuf[MIB_TMP_MAXLEN];
u16 *wordbuf = (u16*) bytebuf; u16 *wordbuf = (u16*) bytebuf;
DBFENTER;
if (isget) { if (isget) {
result = hfa384x_drvr_getconfig16(hw, mib->parm1, wordbuf); result = hfa384x_drvr_getconfig16(hw, mib->parm1, wordbuf);
*uint32 = *wordbuf; *uint32 = *wordbuf;
...@@ -494,7 +485,6 @@ void *data) ...@@ -494,7 +485,6 @@ void *data)
result = hfa384x_drvr_setconfig16(hw, mib->parm1, *wordbuf); result = hfa384x_drvr_setconfig16(hw, mib->parm1, *wordbuf);
} }
DBFEXIT;
return(result); return(result);
} }
...@@ -537,8 +527,6 @@ void *data) ...@@ -537,8 +527,6 @@ void *data)
u16 *wordbuf = (u16*) bytebuf; u16 *wordbuf = (u16*) bytebuf;
u32 flags; u32 flags;
DBFENTER;
result = hfa384x_drvr_getconfig16(hw, mib->parm1, wordbuf); result = hfa384x_drvr_getconfig16(hw, mib->parm1, wordbuf);
if (result == 0) { if (result == 0) {
/* [MSM] Removed, getconfig16 returns the value in host order. /* [MSM] Removed, getconfig16 returns the value in host order.
...@@ -561,7 +549,6 @@ void *data) ...@@ -561,7 +549,6 @@ void *data)
} }
} }
DBFEXIT;
return(result); return(result);
} }
...@@ -603,8 +590,6 @@ void *data) ...@@ -603,8 +590,6 @@ void *data)
u8 bytebuf[MIB_TMP_MAXLEN]; u8 bytebuf[MIB_TMP_MAXLEN];
u16 len; u16 len;
DBFENTER;
if (isget) { if (isget) {
result = 0; /* Should never happen. */ result = 0; /* Should never happen. */
} else { } else {
...@@ -615,7 +600,6 @@ void *data) ...@@ -615,7 +600,6 @@ void *data)
result = hfa384x_drvr_setconfig(hw, mib->parm1, bytebuf, len); result = hfa384x_drvr_setconfig(hw, mib->parm1, bytebuf, len);
} }
DBFEXIT;
return(result); return(result);
} }
...@@ -654,8 +638,6 @@ void *data) ...@@ -654,8 +638,6 @@ void *data)
{ {
int result; int result;
DBFENTER;
if (wlandev->hostwep & HOSTWEP_DECRYPT) { if (wlandev->hostwep & HOSTWEP_DECRYPT) {
if (wlandev->hostwep & HOSTWEP_DECRYPT) if (wlandev->hostwep & HOSTWEP_DECRYPT)
mib->parm2 |= HFA384x_WEPFLAGS_DISABLE_RXCRYPT; mib->parm2 |= HFA384x_WEPFLAGS_DISABLE_RXCRYPT;
...@@ -665,7 +647,6 @@ void *data) ...@@ -665,7 +647,6 @@ void *data)
result = prism2mib_flag(mib, isget, wlandev, hw, msg, data); result = prism2mib_flag(mib, isget, wlandev, hw, msg, data);
DBFEXIT;
return(result); return(result);
} }
...@@ -704,11 +685,8 @@ void *data) ...@@ -704,11 +685,8 @@ void *data)
{ {
int result; int result;
DBFENTER;
result = prism2mib_flag(mib, isget, wlandev, hw, msg, data); result = prism2mib_flag(mib, isget, wlandev, hw, msg, data);
DBFEXIT;
return(result); return(result);
} }
...@@ -748,8 +726,6 @@ void *data) ...@@ -748,8 +726,6 @@ void *data)
int result; int result;
u32 *uint32 = (u32*) data; u32 *uint32 = (u32*) data;
DBFENTER;
if (!isget) if (!isget)
if ((*uint32) % 2) { if ((*uint32) % 2) {
WLAN_LOG_WARNING("Attempt to set odd number " WLAN_LOG_WARNING("Attempt to set odd number "
...@@ -760,7 +736,6 @@ void *data) ...@@ -760,7 +736,6 @@ void *data)
result = prism2mib_uint32(mib, isget, wlandev, hw, msg, data); result = prism2mib_uint32(mib, isget, wlandev, hw, msg, data);
DBFEXIT;
return(result); return(result);
} }
...@@ -801,8 +776,6 @@ void *data) ...@@ -801,8 +776,6 @@ void *data)
int result; int result;
DBFENTER;
switch (mib->did) { switch (mib->did) {
case DIDmib_lnx_lnxConfigTable_lnxRSNAIE: { case DIDmib_lnx_lnxConfigTable_lnxRSNAIE: {
hfa384x_WPAData_t wpa; hfa384x_WPAData_t wpa;
...@@ -824,7 +797,6 @@ void *data) ...@@ -824,7 +797,6 @@ void *data)
WLAN_LOG_ERROR("Unhandled DID 0x%08x\n", mib->did); WLAN_LOG_ERROR("Unhandled DID 0x%08x\n", mib->did);
} }
DBFEXIT;
return(0); return(0);
} }
...@@ -845,11 +817,8 @@ void *data) ...@@ -845,11 +817,8 @@ void *data)
void prism2mgmt_pstr2bytestr(hfa384x_bytestr_t *bytestr, p80211pstrd_t *pstr) void prism2mgmt_pstr2bytestr(hfa384x_bytestr_t *bytestr, p80211pstrd_t *pstr)
{ {
DBFENTER;
bytestr->len = host2hfa384x_16((u16)(pstr->len)); bytestr->len = host2hfa384x_16((u16)(pstr->len));
memcpy(bytestr->data, pstr->data, pstr->len); memcpy(bytestr->data, pstr->data, pstr->len);
DBFEXIT;
} }
...@@ -870,10 +839,7 @@ void prism2mgmt_pstr2bytestr(hfa384x_bytestr_t *bytestr, p80211pstrd_t *pstr) ...@@ -870,10 +839,7 @@ void prism2mgmt_pstr2bytestr(hfa384x_bytestr_t *bytestr, p80211pstrd_t *pstr)
void prism2mgmt_pstr2bytearea(u8 *bytearea, p80211pstrd_t *pstr) void prism2mgmt_pstr2bytearea(u8 *bytearea, p80211pstrd_t *pstr)
{ {
DBFENTER;
memcpy(bytearea, pstr->data, pstr->len); memcpy(bytearea, pstr->data, pstr->len);
DBFEXIT;
} }
...@@ -894,11 +860,8 @@ void prism2mgmt_pstr2bytearea(u8 *bytearea, p80211pstrd_t *pstr) ...@@ -894,11 +860,8 @@ void prism2mgmt_pstr2bytearea(u8 *bytearea, p80211pstrd_t *pstr)
void prism2mgmt_bytestr2pstr(hfa384x_bytestr_t *bytestr, p80211pstrd_t *pstr) void prism2mgmt_bytestr2pstr(hfa384x_bytestr_t *bytestr, p80211pstrd_t *pstr)
{ {
DBFENTER;
pstr->len = (u8)(hfa384x2host_16((u16)(bytestr->len))); pstr->len = (u8)(hfa384x2host_16((u16)(bytestr->len)));
memcpy(pstr->data, bytestr->data, pstr->len); memcpy(pstr->data, bytestr->data, pstr->len);
DBFEXIT;
} }
...@@ -919,11 +882,8 @@ void prism2mgmt_bytestr2pstr(hfa384x_bytestr_t *bytestr, p80211pstrd_t *pstr) ...@@ -919,11 +882,8 @@ void prism2mgmt_bytestr2pstr(hfa384x_bytestr_t *bytestr, p80211pstrd_t *pstr)
void prism2mgmt_bytearea2pstr(u8 *bytearea, p80211pstrd_t *pstr, int len) void prism2mgmt_bytearea2pstr(u8 *bytearea, p80211pstrd_t *pstr, int len)
{ {
DBFENTER;
pstr->len = (u8)len; pstr->len = (u8)len;
memcpy(pstr->data, bytearea, len); memcpy(pstr->data, bytearea, len);
DBFEXIT;
} }
...@@ -943,10 +903,7 @@ void prism2mgmt_bytearea2pstr(u8 *bytearea, p80211pstrd_t *pstr, int len) ...@@ -943,10 +903,7 @@ void prism2mgmt_bytearea2pstr(u8 *bytearea, p80211pstrd_t *pstr, int len)
void prism2mgmt_prism2int2p80211int(u16 *prism2int, u32 *wlanint) void prism2mgmt_prism2int2p80211int(u16 *prism2int, u32 *wlanint)
{ {
DBFENTER;
*wlanint = (u32)hfa384x2host_16(*prism2int); *wlanint = (u32)hfa384x2host_16(*prism2int);
DBFEXIT;
} }
...@@ -966,10 +923,7 @@ void prism2mgmt_prism2int2p80211int(u16 *prism2int, u32 *wlanint) ...@@ -966,10 +923,7 @@ void prism2mgmt_prism2int2p80211int(u16 *prism2int, u32 *wlanint)
void prism2mgmt_p80211int2prism2int(u16 *prism2int, u32 *wlanint) void prism2mgmt_p80211int2prism2int(u16 *prism2int, u32 *wlanint)
{ {
DBFENTER;
*prism2int = host2hfa384x_16((u16)(*wlanint)); *prism2int = host2hfa384x_16((u16)(*wlanint));
DBFEXIT;
} }
...@@ -989,12 +943,9 @@ void prism2mgmt_p80211int2prism2int(u16 *prism2int, u32 *wlanint) ...@@ -989,12 +943,9 @@ void prism2mgmt_p80211int2prism2int(u16 *prism2int, u32 *wlanint)
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
void prism2mgmt_prism2enum2p80211enum(u16 *prism2enum, u32 *wlanenum, u16 rid) void prism2mgmt_prism2enum2p80211enum(u16 *prism2enum, u32 *wlanenum, u16 rid)
{ {
DBFENTER;
/* At the moment, the need for this functionality hasn't /* At the moment, the need for this functionality hasn't
presented itself. All the wlan enumerated values are presented itself. All the wlan enumerated values are
a 1-to-1 match against the Prism2 enumerated values*/ a 1-to-1 match against the Prism2 enumerated values*/
DBFEXIT;
return; return;
} }
...@@ -1015,12 +966,9 @@ void prism2mgmt_prism2enum2p80211enum(u16 *prism2enum, u32 *wlanenum, u16 rid) ...@@ -1015,12 +966,9 @@ void prism2mgmt_prism2enum2p80211enum(u16 *prism2enum, u32 *wlanenum, u16 rid)
----------------------------------------------------------------*/ ----------------------------------------------------------------*/
void prism2mgmt_p80211enum2prism2enum(u16 *prism2enum, u32 *wlanenum, u16 rid) void prism2mgmt_p80211enum2prism2enum(u16 *prism2enum, u32 *wlanenum, u16 rid)
{ {
DBFENTER;
/* At the moment, the need for this functionality hasn't /* At the moment, the need for this functionality hasn't
presented itself. All the wlan enumerated values are presented itself. All the wlan enumerated values are
a 1-to-1 match against the Prism2 enumerated values*/ a 1-to-1 match against the Prism2 enumerated values*/
DBFEXIT;
return; return;
} }
...@@ -1044,8 +992,6 @@ void prism2mgmt_get_oprateset(u16 *rate, p80211pstrd_t *pstr) ...@@ -1044,8 +992,6 @@ void prism2mgmt_get_oprateset(u16 *rate, p80211pstrd_t *pstr)
u8 len; u8 len;
u8 *datarate; u8 *datarate;
DBFENTER;
len = 0; len = 0;
datarate = pstr->data; datarate = pstr->data;
...@@ -1079,7 +1025,6 @@ void prism2mgmt_get_oprateset(u16 *rate, p80211pstrd_t *pstr) ...@@ -1079,7 +1025,6 @@ void prism2mgmt_get_oprateset(u16 *rate, p80211pstrd_t *pstr)
pstr->len = len; pstr->len = len;
DBFEXIT;
return; return;
} }
...@@ -1103,8 +1048,6 @@ void prism2mgmt_set_oprateset(u16 *rate, p80211pstrd_t *pstr) ...@@ -1103,8 +1048,6 @@ void prism2mgmt_set_oprateset(u16 *rate, p80211pstrd_t *pstr)
u8 *datarate; u8 *datarate;
int i; int i;
DBFENTER;
*rate = 0; *rate = 0;
datarate = pstr->data; datarate = pstr->data;
...@@ -1130,6 +1073,5 @@ void prism2mgmt_set_oprateset(u16 *rate, p80211pstrd_t *pstr) ...@@ -1130,6 +1073,5 @@ void prism2mgmt_set_oprateset(u16 *rate, p80211pstrd_t *pstr)
} }
} }
DBFEXIT;
return; return;
} }
drivers/staging/wlan-ng/prism2sta.c
View file @ 8a251b55
This diff is collapsed.
drivers/staging/wlan-ng/prism2usb.c
View file @ 8a251b55
...@@ -85,8 +85,6 @@ static int prism2sta_probe_usb( ...@@ -85,8 +85,6 @@ static int prism2sta_probe_usb(
hfa384x_t *hw = NULL; hfa384x_t *hw = NULL;
int result = 0; int result = 0;
DBFENTER;
dev = interface_to_usbdev(interface); dev = interface_to_usbdev(interface);
if ((wlandev = create_wlan()) == NULL) { if ((wlandev = create_wlan()) == NULL) {
...@@ -148,8 +146,6 @@ static int prism2sta_probe_usb( ...@@ -148,8 +146,6 @@ static int prism2sta_probe_usb(
wlandev = NULL; wlandev = NULL;
done: done:
DBFEXIT;
usb_set_intfdata(interface, wlandev); usb_set_intfdata(interface, wlandev);
return result; return result;
} }
...@@ -179,8 +175,6 @@ prism2sta_disconnect_usb(struct usb_interface *interface) ...@@ -179,8 +175,6 @@ prism2sta_disconnect_usb(struct usb_interface *interface)
{ {
wlandevice_t *wlandev; wlandevice_t *wlandev;
DBFENTER;
wlandev = (wlandevice_t *) usb_get_intfdata(interface); wlandev = (wlandevice_t *) usb_get_intfdata(interface);
if ( wlandev != NULL ) { if ( wlandev != NULL ) {
...@@ -265,9 +259,7 @@ prism2sta_disconnect_usb(struct usb_interface *interface) ...@@ -265,9 +259,7 @@ prism2sta_disconnect_usb(struct usb_interface *interface)
} }
exit: exit:
usb_set_intfdata(interface, NULL); usb_set_intfdata(interface, NULL);
DBFEXIT;
} }
...@@ -281,21 +273,13 @@ static struct usb_driver prism2_usb_driver = { ...@@ -281,21 +273,13 @@ static struct usb_driver prism2_usb_driver = {
static int __init prism2usb_init(void) static int __init prism2usb_init(void)
{ {
DBFENTER;
/* This call will result in calls to prism2sta_probe_usb. */ /* This call will result in calls to prism2sta_probe_usb. */
return usb_register(&prism2_usb_driver); return usb_register(&prism2_usb_driver);
DBFEXIT;
}; };
static void __exit prism2usb_cleanup(void) static void __exit prism2usb_cleanup(void)
{ {
DBFENTER;
usb_deregister(&prism2_usb_driver); usb_deregister(&prism2_usb_driver);
DBFEXIT;
}; };
module_init(prism2usb_init); module_init(prism2usb_init);
......
drivers/staging/wlan-ng/wlan_compat.h
View file @ 8a251b55
...@@ -110,14 +110,10 @@ ...@@ -110,14 +110,10 @@
for( __i__=0; __i__ < (n); __i__++) \ for( __i__=0; __i__ < (n); __i__++) \
printk( " %02x", ((u8*)(p))[__i__]); \ printk( " %02x", ((u8*)(p))[__i__]); \
printk("\n"); } printk("\n"); }
#define DBFENTER { if ( WLAN_DBVAR >= 5 ){ WLAN_LOG_DEBUG(3,"---->\n"); } }
#define DBFEXIT { if ( WLAN_DBVAR >= 5 ){ WLAN_LOG_DEBUG(3,"<----\n"); } }
#define WLAN_LOG_DEBUG(l,x,args...) if ( WLAN_DBVAR >= (l)) printk(KERN_DEBUG "%s(%lu): " x , __func__, (preempt_count() & PREEMPT_MASK), ##args ); #define WLAN_LOG_DEBUG(l,x,args...) if ( WLAN_DBVAR >= (l)) printk(KERN_DEBUG "%s(%lu): " x , __func__, (preempt_count() & PREEMPT_MASK), ##args );
#else #else
#define WLAN_HEX_DUMP( l, s, p, n) #define WLAN_HEX_DUMP( l, s, p, n)
#define DBFENTER
#define DBFEXIT
#define WLAN_LOG_DEBUG(l, s, args...) #define WLAN_LOG_DEBUG(l, s, args...)
#endif #endif
......
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