Skip to content

Commit

Permalink
Staging: wlan-ng: Remove DBFENTER/DBFEXIT macros
Browse files Browse the repository at this point in the history 
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: Moritz Muehlenhoff <jmm@debian.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Moritz Muehlenhoff authored and Greg Kroah-Hartman committed Apr 3, 2009
1 parent 1f61379 commit 8a251b5
Show file tree
Hide file tree
Showing 10 changed files with 11 additions and 520 deletions.
177 changes: 6 additions & 171 deletions drivers/staging/wlan-ng/hfa384x_usb.c
View file

Large diffs are not rendered by default.

13 changes: 1 addition & 12 deletions drivers/staging/wlan-ng/p80211conv.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,6 @@ int skb_ether_to_p80211( wlandevice_t *wlandev, u32 ethconv, struct sk_buff *skb
wlan_snap_t *e_snap;
int foo;

DBFENTER;
memcpy(&e_hdr, skb->data, sizeof(e_hdr));

if (skb->len <= 0) {
Expand Down Expand Up @@ -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.seq = 0;

DBFEXIT;
return 0;
}

Expand Down Expand Up @@ -308,8 +306,6 @@ int skb_p80211_to_ether( wlandevice_t *wlandev, u32 ethconv, struct sk_buff *skb

int foo;

DBFENTER;

payload_length = skb->len - WLAN_HDR_A3_LEN - WLAN_CRC_LEN;
payload_offset = WLAN_HDR_A3_LEN;

Expand Down Expand Up @@ -511,7 +507,6 @@ int skb_p80211_to_ether( wlandevice_t *wlandev, u32 ethconv, struct sk_buff *skb
/* Free the metadata */
p80211skb_rxmeta_detach(skb);

DBFEXIT;
return 0;
}

Expand Down Expand Up @@ -567,7 +562,6 @@ p80211skb_rxmeta_detach(struct sk_buff *skb)
p80211_rxmeta_t *rxmeta;
p80211_frmmeta_t *frmmeta;

DBFENTER;
/* Sanity checks */
if ( skb==NULL ) { /* bad skb */
WLAN_LOG_DEBUG(1, "Called w/ null skb.\n");
Expand All @@ -590,7 +584,6 @@ p80211skb_rxmeta_detach(struct sk_buff *skb)
/* Clear skb->cb */
memset(skb->cb, 0, sizeof(skb->cb));
exit:
DBFEXIT;
return;
}

Expand All @@ -617,8 +610,6 @@ p80211skb_rxmeta_attach(struct wlandevice *wlandev, struct sk_buff *skb)
p80211_rxmeta_t *rxmeta;
p80211_frmmeta_t *frmmeta;

DBFENTER;

/* If these already have metadata, we error out! */
if (P80211SKB_RXMETA(skb) != NULL) {
WLAN_LOG_ERROR("%s: RXmeta already attached!\n",
Expand Down Expand Up @@ -648,7 +639,6 @@ p80211skb_rxmeta_attach(struct wlandevice *wlandev, struct sk_buff *skb)
frmmeta->magic = P80211_FRMMETA_MAGIC;
frmmeta->rx = rxmeta;
exit:
DBFEXIT;
return result;
}

Expand All @@ -672,7 +662,7 @@ void
p80211skb_free(struct wlandevice *wlandev, struct sk_buff *skb)
{
p80211_frmmeta_t *meta;
DBFENTER;

meta = P80211SKB_FRMMETA(skb);
if ( meta && meta->rx) {
p80211skb_rxmeta_detach(skb);
Expand All @@ -681,6 +671,5 @@ p80211skb_free(struct wlandevice *wlandev, struct sk_buff *skb)
}

dev_kfree_skb(skb);
DBFEXIT;
return;
}
49 changes: 0 additions & 49 deletions drivers/staging/wlan-ng/p80211netdev.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,12 +157,10 @@ MODULE_PARM_DESC(wlan_debug, "p80211 debug level");
----------------------------------------------------------------*/
static int p80211knetdev_init( netdevice_t *netdev)
{
DBFENTER;
/* Called in response to register_netdev */
/* This is usually the probe function, but the probe has */
/* already been done by the MSD and the create_kdev */
/* function. All we do here is return success */
DBFEXIT;
return 0;
}

Expand All @@ -185,12 +183,10 @@ static struct net_device_stats*
p80211knetdev_get_stats(netdevice_t *netdev)
{
wlandevice_t *wlandev = netdev->ml_priv;
DBFENTER;

/* TODO: review the MIB stats for items that correspond to
linux stats */

DBFEXIT;
return &(wlandev->linux_stats);
}

Expand All @@ -214,8 +210,6 @@ static int p80211knetdev_open( netdevice_t *netdev )
int result = 0; /* success */
wlandevice_t *wlandev = netdev->ml_priv;

DBFENTER;

/* Check to make sure the MSD is running */
if ( wlandev->msdstate != WLAN_MSD_RUNNING ) {
return -ENODEV;
Expand All @@ -232,7 +226,6 @@ static int p80211knetdev_open( netdevice_t *netdev )
result = -EAGAIN;
}

DBFEXIT;
return result;
}

Expand All @@ -254,16 +247,13 @@ static int p80211knetdev_stop( netdevice_t *netdev )
int result = 0;
wlandevice_t *wlandev = netdev->ml_priv;

DBFENTER;

if ( wlandev->close != NULL ) {
result = wlandev->close(wlandev);
}

netif_stop_queue(wlandev->netdev);
wlandev->state = WLAN_DEVICE_CLOSED;

DBFEXIT;
return result;
}

Expand All @@ -283,14 +273,11 @@ static int p80211knetdev_stop( netdevice_t *netdev )
void
p80211netdev_rx(wlandevice_t *wlandev, struct sk_buff *skb )
{
DBFENTER;

/* Enqueue for post-irq processing */
skb_queue_tail(&wlandev->nsd_rxq, skb);

tasklet_schedule(&wlandev->rx_bh);

DBFEXIT;
return;
}

Expand All @@ -315,8 +302,6 @@ static void p80211netdev_rx_bh(unsigned long arg)
p80211_hdr_a3_t *hdr;
u16 fc;

DBFENTER;

/* Let's empty our our queue */
while ( (skb = skb_dequeue(&wlandev->nsd_rxq)) ) {
if (wlandev->state == WLAN_DEVICE_OPEN) {
Expand Down Expand Up @@ -369,8 +354,6 @@ static void p80211netdev_rx_bh(unsigned long arg)
}
dev_kfree_skb(skb);
}

DBFEXIT;
}


Expand Down Expand Up @@ -401,8 +384,6 @@ static int p80211knetdev_hard_start_xmit( struct sk_buff *skb, netdevice_t *netd
p80211_hdr_t p80211_hdr;
p80211_metawep_t p80211_wep;

DBFENTER;

if (skb == NULL) {
return 0;
}
Expand Down Expand Up @@ -506,7 +487,6 @@ static int p80211knetdev_hard_start_xmit( struct sk_buff *skb, netdevice_t *netd
if (!result)
dev_kfree_skb(skb);

DBFEXIT;
return result;
}

Expand All @@ -527,14 +507,11 @@ static void p80211knetdev_set_multicast_list(netdevice_t *dev)
{
wlandevice_t *wlandev = dev->ml_priv;

DBFENTER;

/* TODO: real multicast support as well */

if (wlandev->set_multicast_list)
wlandev->set_multicast_list(wlandev, dev);

DBFEXIT;
}

#ifdef SIOCETHTOOL
Expand Down Expand Up @@ -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;
wlandevice_t *wlandev = dev->ml_priv;
u8 *msgbuf;
DBFENTER;

WLAN_LOG_DEBUG(2, "rx'd ioctl, cmd=%d, len=%d\n", cmd, req->len);

Expand Down Expand Up @@ -663,8 +639,6 @@ static int p80211knetdev_do_ioctl(netdevice_t *dev, struct ifreq *ifr, int cmd)
result = -ENOMEM;
}
bail:
DBFEXIT;

return result; /* If allocate,copyfrom or copyto fails, return errno */
}

Expand Down Expand Up @@ -702,7 +676,6 @@ static int p80211knetdev_set_mac_address(netdevice_t *dev, void *addr)
p80211item_uint32_t *resultcode;
int result = 0;

DBFENTER;
/* If we're running, we don't allow MAC address changes */
if (netif_running(dev)) {
return -EBUSY;
Expand Down Expand Up @@ -753,22 +726,18 @@ static int p80211knetdev_set_mac_address(netdevice_t *dev, void *addr)
memcpy(dev->dev_addr, new_addr->sa_data, dev->addr_len);
}

DBFEXIT;
return result;
}

static int wlan_change_mtu(netdevice_t *dev, int new_mtu)
{
DBFENTER;
// 2312 is max 802.11 payload, 20 is overhead, (ether + llc +snap)
// and another 8 for wep.
if ( (new_mtu < 68) || (new_mtu > (2312 - 20 - 8)))
return -EINVAL;

dev->mtu = new_mtu;

DBFEXIT;

return 0;
}

Expand Down Expand Up @@ -801,8 +770,6 @@ int wlan_setup(wlandevice_t *wlandev)
int result = 0;
netdevice_t *dev;

DBFENTER;

/* Set up the wlandev */
wlandev->state = WLAN_DEVICE_CLOSED;
wlandev->ethconv = WLAN_ETHCONV_8021h;
Expand Down Expand Up @@ -853,7 +820,6 @@ int wlan_setup(wlandevice_t *wlandev)
netif_carrier_off(dev);
}

DBFEXIT;
return result;
}

Expand Down Expand Up @@ -882,8 +848,6 @@ int wlan_unsetup(wlandevice_t *wlandev)
{
int result = 0;

DBFENTER;

tasklet_kill(&wlandev->rx_bh);

if (wlandev->netdev == NULL ) {
Expand All @@ -894,7 +858,6 @@ int wlan_unsetup(wlandevice_t *wlandev)
wlandev->netdev = NULL;
}

DBFEXIT;
return 0;
}

Expand Down Expand Up @@ -923,13 +886,10 @@ int register_wlandev(wlandevice_t *wlandev)
{
int i = 0;

DBFENTER;

i = register_netdev(wlandev->netdev);
if (i)
return i;

DBFEXIT;
return 0;
}

Expand All @@ -955,16 +915,13 @@ int unregister_wlandev(wlandevice_t *wlandev)
{
struct sk_buff *skb;

DBFENTER;

unregister_netdev(wlandev->netdev);

/* Now to clean out the rx queue */
while ( (skb = skb_dequeue(&wlandev->nsd_rxq)) ) {
dev_kfree_skb(skb);
}

DBFEXIT;
return 0;
}

Expand Down Expand Up @@ -1001,15 +958,12 @@ int unregister_wlandev(wlandevice_t *wlandev)
----------------------------------------------------------------*/
void p80211netdev_hwremoved(wlandevice_t *wlandev)
{
DBFENTER;
wlandev->hwremoved = 1;
if ( wlandev->state == WLAN_DEVICE_OPEN) {
netif_stop_queue(wlandev->netdev);
}

netif_device_detach(wlandev->netdev);

DBFEXIT;
}


Expand Down Expand Up @@ -1196,7 +1150,6 @@ static int p80211_rx_typedrop( wlandevice_t *wlandev, u16 fc)
static void p80211knetdev_tx_timeout( netdevice_t *netdev)
{
wlandevice_t *wlandev = netdev->ml_priv;
DBFENTER;

if (wlandev->tx_timeout) {
wlandev->tx_timeout(wlandev);
Expand All @@ -1205,6 +1158,4 @@ static void p80211knetdev_tx_timeout( netdevice_t *netdev)
wlandev->nsdname);
netif_wake_queue(wlandev->netdev);
}

DBFEXIT;
}
Loading

0 comments on commit 8a251b5

Please sign in to comment.