diff options
author | Pavel Roskin <proski@gnu.org> | 2006-04-07 04:10:28 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2006-04-24 16:15:49 -0400 |
commit | 65b1fe7df71e7ad09e9203b6c3875781c30557e0 (patch) | |
tree | cfec3c86e899d6148a75b7f21782374e3b9c044f /drivers/net/wireless/orinoco.c | |
parent | 7eeae2ffadf170f954205733f511ca40df91f0b7 (diff) |
[PATCH] orinoco: remove tracing code, it's unused
Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/orinoco.c')
-rw-r--r-- | drivers/net/wireless/orinoco.c | 83 |
1 files changed, 0 insertions, 83 deletions
diff --git a/drivers/net/wireless/orinoco.c b/drivers/net/wireless/orinoco.c index 06523e2a8471..9550bf308b1a 100644 --- a/drivers/net/wireless/orinoco.c +++ b/drivers/net/wireless/orinoco.c | |||
@@ -456,26 +456,21 @@ static int orinoco_xmit(struct sk_buff *skb, struct net_device *dev) | |||
456 | struct hermes_tx_descriptor desc; | 456 | struct hermes_tx_descriptor desc; |
457 | unsigned long flags; | 457 | unsigned long flags; |
458 | 458 | ||
459 | TRACE_ENTER(dev->name); | ||
460 | |||
461 | if (! netif_running(dev)) { | 459 | if (! netif_running(dev)) { |
462 | printk(KERN_ERR "%s: Tx on stopped device!\n", | 460 | printk(KERN_ERR "%s: Tx on stopped device!\n", |
463 | dev->name); | 461 | dev->name); |
464 | TRACE_EXIT(dev->name); | ||
465 | return 1; | 462 | return 1; |
466 | } | 463 | } |
467 | 464 | ||
468 | if (netif_queue_stopped(dev)) { | 465 | if (netif_queue_stopped(dev)) { |
469 | printk(KERN_DEBUG "%s: Tx while transmitter busy!\n", | 466 | printk(KERN_DEBUG "%s: Tx while transmitter busy!\n", |
470 | dev->name); | 467 | dev->name); |
471 | TRACE_EXIT(dev->name); | ||
472 | return 1; | 468 | return 1; |
473 | } | 469 | } |
474 | 470 | ||
475 | if (orinoco_lock(priv, &flags) != 0) { | 471 | if (orinoco_lock(priv, &flags) != 0) { |
476 | printk(KERN_ERR "%s: orinoco_xmit() called while hw_unavailable\n", | 472 | printk(KERN_ERR "%s: orinoco_xmit() called while hw_unavailable\n", |
477 | dev->name); | 473 | dev->name); |
478 | TRACE_EXIT(dev->name); | ||
479 | return 1; | 474 | return 1; |
480 | } | 475 | } |
481 | 476 | ||
@@ -486,7 +481,6 @@ static int orinoco_xmit(struct sk_buff *skb, struct net_device *dev) | |||
486 | stats->tx_errors++; | 481 | stats->tx_errors++; |
487 | orinoco_unlock(priv, &flags); | 482 | orinoco_unlock(priv, &flags); |
488 | dev_kfree_skb(skb); | 483 | dev_kfree_skb(skb); |
489 | TRACE_EXIT(dev->name); | ||
490 | return 0; | 484 | return 0; |
491 | } | 485 | } |
492 | 486 | ||
@@ -586,11 +580,8 @@ static int orinoco_xmit(struct sk_buff *skb, struct net_device *dev) | |||
586 | 580 | ||
587 | dev_kfree_skb(skb); | 581 | dev_kfree_skb(skb); |
588 | 582 | ||
589 | TRACE_EXIT(dev->name); | ||
590 | |||
591 | return 0; | 583 | return 0; |
592 | fail: | 584 | fail: |
593 | TRACE_EXIT(dev->name); | ||
594 | 585 | ||
595 | orinoco_unlock(priv, &flags); | 586 | orinoco_unlock(priv, &flags); |
596 | return err; | 587 | return err; |
@@ -2274,8 +2265,6 @@ static int orinoco_init(struct net_device *dev) | |||
2274 | u16 reclen; | 2265 | u16 reclen; |
2275 | int len; | 2266 | int len; |
2276 | 2267 | ||
2277 | TRACE_ENTER(dev->name); | ||
2278 | |||
2279 | /* No need to lock, the hw_unavailable flag is already set in | 2268 | /* No need to lock, the hw_unavailable flag is already set in |
2280 | * alloc_orinocodev() */ | 2269 | * alloc_orinocodev() */ |
2281 | priv->nicbuf_size = IEEE80211_FRAME_LEN + ETH_HLEN; | 2270 | priv->nicbuf_size = IEEE80211_FRAME_LEN + ETH_HLEN; |
@@ -2429,7 +2418,6 @@ static int orinoco_init(struct net_device *dev) | |||
2429 | printk(KERN_DEBUG "%s: ready\n", dev->name); | 2418 | printk(KERN_DEBUG "%s: ready\n", dev->name); |
2430 | 2419 | ||
2431 | out: | 2420 | out: |
2432 | TRACE_EXIT(dev->name); | ||
2433 | return err; | 2421 | return err; |
2434 | } | 2422 | } |
2435 | 2423 | ||
@@ -2797,8 +2785,6 @@ static int orinoco_ioctl_getiwrange(struct net_device *dev, | |||
2797 | int numrates; | 2785 | int numrates; |
2798 | int i, k; | 2786 | int i, k; |
2799 | 2787 | ||
2800 | TRACE_ENTER(dev->name); | ||
2801 | |||
2802 | rrq->length = sizeof(struct iw_range); | 2788 | rrq->length = sizeof(struct iw_range); |
2803 | memset(range, 0, sizeof(struct iw_range)); | 2789 | memset(range, 0, sizeof(struct iw_range)); |
2804 | 2790 | ||
@@ -2888,8 +2874,6 @@ static int orinoco_ioctl_getiwrange(struct net_device *dev, | |||
2888 | IW_EVENT_CAPA_SET(range->event_capa, SIOCGIWSCAN); | 2874 | IW_EVENT_CAPA_SET(range->event_capa, SIOCGIWSCAN); |
2889 | IW_EVENT_CAPA_SET(range->event_capa, IWEVTXDROP); | 2875 | IW_EVENT_CAPA_SET(range->event_capa, IWEVTXDROP); |
2890 | 2876 | ||
2891 | TRACE_EXIT(dev->name); | ||
2892 | |||
2893 | return 0; | 2877 | return 0; |
2894 | } | 2878 | } |
2895 | 2879 | ||
@@ -3071,8 +3055,6 @@ static int orinoco_ioctl_getessid(struct net_device *dev, | |||
3071 | int err = 0; | 3055 | int err = 0; |
3072 | unsigned long flags; | 3056 | unsigned long flags; |
3073 | 3057 | ||
3074 | TRACE_ENTER(dev->name); | ||
3075 | |||
3076 | if (netif_running(dev)) { | 3058 | if (netif_running(dev)) { |
3077 | err = orinoco_hw_get_essid(priv, &active, essidbuf); | 3059 | err = orinoco_hw_get_essid(priv, &active, essidbuf); |
3078 | if (err) | 3060 | if (err) |
@@ -3087,8 +3069,6 @@ static int orinoco_ioctl_getessid(struct net_device *dev, | |||
3087 | erq->flags = 1; | 3069 | erq->flags = 1; |
3088 | erq->length = strlen(essidbuf) + 1; | 3070 | erq->length = strlen(essidbuf) + 1; |
3089 | 3071 | ||
3090 | TRACE_EXIT(dev->name); | ||
3091 | |||
3092 | return 0; | 3072 | return 0; |
3093 | } | 3073 | } |
3094 | 3074 | ||
@@ -4349,69 +4329,6 @@ static struct ethtool_ops orinoco_ethtool_ops = { | |||
4349 | }; | 4329 | }; |
4350 | 4330 | ||
4351 | /********************************************************************/ | 4331 | /********************************************************************/ |
4352 | /* Debugging */ | ||
4353 | /********************************************************************/ | ||
4354 | |||
4355 | #if 0 | ||
4356 | static void show_rx_frame(struct orinoco_rxframe_hdr *frame) | ||
4357 | { | ||
4358 | printk(KERN_DEBUG "RX descriptor:\n"); | ||
4359 | printk(KERN_DEBUG " status = 0x%04x\n", frame->desc.status); | ||
4360 | printk(KERN_DEBUG " time = 0x%08x\n", frame->desc.time); | ||
4361 | printk(KERN_DEBUG " silence = 0x%02x\n", frame->desc.silence); | ||
4362 | printk(KERN_DEBUG " signal = 0x%02x\n", frame->desc.signal); | ||
4363 | printk(KERN_DEBUG " rate = 0x%02x\n", frame->desc.rate); | ||
4364 | printk(KERN_DEBUG " rxflow = 0x%02x\n", frame->desc.rxflow); | ||
4365 | printk(KERN_DEBUG " reserved = 0x%08x\n", frame->desc.reserved); | ||
4366 | |||
4367 | printk(KERN_DEBUG "IEEE 802.11 header:\n"); | ||
4368 | printk(KERN_DEBUG " frame_ctl = 0x%04x\n", | ||
4369 | frame->p80211.frame_ctl); | ||
4370 | printk(KERN_DEBUG " duration_id = 0x%04x\n", | ||
4371 | frame->p80211.duration_id); | ||
4372 | printk(KERN_DEBUG " addr1 = %02x:%02x:%02x:%02x:%02x:%02x\n", | ||
4373 | frame->p80211.addr1[0], frame->p80211.addr1[1], | ||
4374 | frame->p80211.addr1[2], frame->p80211.addr1[3], | ||
4375 | frame->p80211.addr1[4], frame->p80211.addr1[5]); | ||
4376 | printk(KERN_DEBUG " addr2 = %02x:%02x:%02x:%02x:%02x:%02x\n", | ||
4377 | frame->p80211.addr2[0], frame->p80211.addr2[1], | ||
4378 | frame->p80211.addr2[2], frame->p80211.addr2[3], | ||
4379 | frame->p80211.addr2[4], frame->p80211.addr2[5]); | ||
4380 | printk(KERN_DEBUG " addr3 = %02x:%02x:%02x:%02x:%02x:%02x\n", | ||
4381 | frame->p80211.addr3[0], frame->p80211.addr3[1], | ||
4382 | frame->p80211.addr3[2], frame->p80211.addr3[3], | ||
4383 | frame->p80211.addr3[4], frame->p80211.addr3[5]); | ||
4384 | printk(KERN_DEBUG " seq_ctl = 0x%04x\n", | ||
4385 | frame->p80211.seq_ctl); | ||
4386 | printk(KERN_DEBUG " addr4 = %02x:%02x:%02x:%02x:%02x:%02x\n", | ||
4387 | frame->p80211.addr4[0], frame->p80211.addr4[1], | ||
4388 | frame->p80211.addr4[2], frame->p80211.addr4[3], | ||
4389 | frame->p80211.addr4[4], frame->p80211.addr4[5]); | ||
4390 | printk(KERN_DEBUG " data_len = 0x%04x\n", | ||
4391 | frame->p80211.data_len); | ||
4392 | |||
4393 | printk(KERN_DEBUG "IEEE 802.3 header:\n"); | ||
4394 | printk(KERN_DEBUG " dest = %02x:%02x:%02x:%02x:%02x:%02x\n", | ||
4395 | frame->p8023.h_dest[0], frame->p8023.h_dest[1], | ||
4396 | frame->p8023.h_dest[2], frame->p8023.h_dest[3], | ||
4397 | frame->p8023.h_dest[4], frame->p8023.h_dest[5]); | ||
4398 | printk(KERN_DEBUG " src = %02x:%02x:%02x:%02x:%02x:%02x\n", | ||
4399 | frame->p8023.h_source[0], frame->p8023.h_source[1], | ||
4400 | frame->p8023.h_source[2], frame->p8023.h_source[3], | ||
4401 | frame->p8023.h_source[4], frame->p8023.h_source[5]); | ||
4402 | printk(KERN_DEBUG " len = 0x%04x\n", frame->p8023.h_proto); | ||
4403 | |||
4404 | printk(KERN_DEBUG "IEEE 802.2 LLC/SNAP header:\n"); | ||
4405 | printk(KERN_DEBUG " DSAP = 0x%02x\n", frame->p8022.dsap); | ||
4406 | printk(KERN_DEBUG " SSAP = 0x%02x\n", frame->p8022.ssap); | ||
4407 | printk(KERN_DEBUG " ctrl = 0x%02x\n", frame->p8022.ctrl); | ||
4408 | printk(KERN_DEBUG " OUI = %02x:%02x:%02x\n", | ||
4409 | frame->p8022.oui[0], frame->p8022.oui[1], frame->p8022.oui[2]); | ||
4410 | printk(KERN_DEBUG " ethertype = 0x%04x\n", frame->ethertype); | ||
4411 | } | ||
4412 | #endif /* 0 */ | ||
4413 | |||
4414 | /********************************************************************/ | ||
4415 | /* Module initialization */ | 4332 | /* Module initialization */ |
4416 | /********************************************************************/ | 4333 | /********************************************************************/ |
4417 | 4334 | ||