diff options
author | xypron.glpk@gmx.de <xypron.glpk@gmx.de> | 2016-05-17 20:13:30 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-05-19 14:35:18 -0400 |
commit | e00be9e4d0ffcc0121606229f0aa4b246d6881d7 (patch) | |
tree | 13f399226697704243378eda9f726635f7f7bbed /drivers/net/usb | |
parent | 074ba1e232f5a562ddd87e6ed0b342faae0aeb9b (diff) |
net: pegasus: remove dead coding
(!count || count < 4) is always true.
So let's remove the coding which is dead at least since 2005.
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb')
-rw-r--r-- | drivers/net/usb/pegasus.c | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c index 36cd7f016a8d..1903d2e2b62d 100644 --- a/drivers/net/usb/pegasus.c +++ b/drivers/net/usb/pegasus.c | |||
@@ -470,61 +470,8 @@ static void read_bulk_callback(struct urb *urb) | |||
470 | return; | 470 | return; |
471 | default: | 471 | default: |
472 | netif_dbg(pegasus, rx_err, net, "RX status %d\n", status); | 472 | netif_dbg(pegasus, rx_err, net, "RX status %d\n", status); |
473 | goto goon; | ||
474 | } | 473 | } |
475 | 474 | ||
476 | if (!count || count < 4) | ||
477 | goto goon; | ||
478 | |||
479 | rx_status = buf[count - 2]; | ||
480 | if (rx_status & 0x1e) { | ||
481 | netif_dbg(pegasus, rx_err, net, | ||
482 | "RX packet error %x\n", rx_status); | ||
483 | pegasus->stats.rx_errors++; | ||
484 | if (rx_status & 0x06) /* long or runt */ | ||
485 | pegasus->stats.rx_length_errors++; | ||
486 | if (rx_status & 0x08) | ||
487 | pegasus->stats.rx_crc_errors++; | ||
488 | if (rx_status & 0x10) /* extra bits */ | ||
489 | pegasus->stats.rx_frame_errors++; | ||
490 | goto goon; | ||
491 | } | ||
492 | if (pegasus->chip == 0x8513) { | ||
493 | pkt_len = le32_to_cpu(*(__le32 *)urb->transfer_buffer); | ||
494 | pkt_len &= 0x0fff; | ||
495 | pegasus->rx_skb->data += 2; | ||
496 | } else { | ||
497 | pkt_len = buf[count - 3] << 8; | ||
498 | pkt_len += buf[count - 4]; | ||
499 | pkt_len &= 0xfff; | ||
500 | pkt_len -= 4; | ||
501 | } | ||
502 | |||
503 | /* | ||
504 | * If the packet is unreasonably long, quietly drop it rather than | ||
505 | * kernel panicing by calling skb_put. | ||
506 | */ | ||
507 | if (pkt_len > PEGASUS_MTU) | ||
508 | goto goon; | ||
509 | |||
510 | /* | ||
511 | * at this point we are sure pegasus->rx_skb != NULL | ||
512 | * so we go ahead and pass up the packet. | ||
513 | */ | ||
514 | skb_put(pegasus->rx_skb, pkt_len); | ||
515 | pegasus->rx_skb->protocol = eth_type_trans(pegasus->rx_skb, net); | ||
516 | netif_rx(pegasus->rx_skb); | ||
517 | pegasus->stats.rx_packets++; | ||
518 | pegasus->stats.rx_bytes += pkt_len; | ||
519 | |||
520 | if (pegasus->flags & PEGASUS_UNPLUG) | ||
521 | return; | ||
522 | |||
523 | pegasus->rx_skb = __netdev_alloc_skb_ip_align(pegasus->net, PEGASUS_MTU, | ||
524 | GFP_ATOMIC); | ||
525 | |||
526 | if (pegasus->rx_skb == NULL) | ||
527 | goto tl_sched; | ||
528 | goon: | 475 | goon: |
529 | usb_fill_bulk_urb(pegasus->rx_urb, pegasus->usb, | 476 | usb_fill_bulk_urb(pegasus->rx_urb, pegasus->usb, |
530 | usb_rcvbulkpipe(pegasus->usb, 1), | 477 | usb_rcvbulkpipe(pegasus->usb, 1), |