From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932101AbcERANv (ORCPT ); Tue, 17 May 2016 20:13:51 -0400 Received: from mout.gmx.net ([212.227.17.20]:61213 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753897AbcERANr (ORCPT ); Tue, 17 May 2016 20:13:47 -0400 From: Heinrich Schuchardt To: Petko Manolov Cc: linux-usb@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Heinrich Schuchardt Subject: [PATCH 1/1] net: pegasus: remove dead coding Date: Wed, 18 May 2016 02:13:30 +0200 Message-Id: <1463530410-12772-1-git-send-email-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.1.4 X-Provags-ID: V03:K0:t6HJAfPYYR1cUxrszGI8i7PmTJDqbakMSlVMP369CEbZlw7FFGp BeFdeWspHBYcQmabh5PUUDrpQSeZG+72H8zNGsU8wA2PjfG1J9WgEkxOXJ5eTY8Yw0E8CSd KrLLb2ZZHBCkHZmHLfCCWw3pyT3SE9QqGfX9kpCzWNtBM0r36urR21OiGUVooDSF0tVvGhl Q1onaxieEnUPERPkLmybA== X-UI-Out-Filterresults: notjunk:1;V01:K0:+O3s127oAXs=:0aKfxALdEs7zwjNo86xeUP wJvuIvRIfDO73bqE5J6JZr3fDWBi+CtdArovxlnOGT8pEnwEAOqgiHQ179d9UU6jHcIzHF0Tg k54pKMfmmzW62rfNQwH57z4bfikkwNYzGgf7rNXNM6ApDPvlaxdB14L3rjQV2uNRRn8o34geI lwOdkVL0Pgzsv2hPGJ8g1iKg9Ku+4Qq+6b/FOeoDcvCl2PPDXB/K+K5uldt2BCJkasVn+llru DeAiGoqyg7r3VPe1GpD2sZyYBggX82FR5GNhtwIKPQYqlMGk+UbaPQmZQPiAV4leN7NDzxsHV /TDlNHzoVO8ac+ImWjT1Li5crVdaco1aZOFH0HE5yAGrid8oIRn2WSUIgWMjIfQcw4ALLTuag IERnhpCEvJrMvJMeuM/vy4xp9s5O4wYbQebKdzZhMmvmwz+1zlGY4KCnEspvfp7fQsqTQAvTy rU4yAitRhFFj7+DiQdSiadPIPm5EzshIVOdVIoWmEzRGI8Du4FxFH5EFWAuRJsrYLe4+eKgbS KSHziQhNTpTz4h1ThSUZSSOnj5xHsWx7d2OMYTnxkgf/P2xwyRb0r/dxDd6jEhLZ+A3w8R/U7 PuRQZnk85LuWxKKkyOyH/HR6ir/KxWkwLNOPrH+qxs5uCL3jb1Pfcmh0+Z1A+smxczZqmQI+n pXu/jITVx3aSbklIQ0AiIdTGM6lVTqfXEL7ktzuTv7y8HQJ6hMc3qsQqyolLSledp2IY7Nm3o aNNqx2tbtCIsAVTYTHt2aJ9NTf+hntoZ29rY5KG0LJcmkjQWg5dTEatXzNQ= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org (!count || count < 4) is always true. So let's remove the coding which is dead at least since 2005. Signed-off-by: Heinrich Schuchardt --- drivers/net/usb/pegasus.c | 53 ----------------------------------------------- 1 file changed, 53 deletions(-) diff --git a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c index 36cd7f0..1903d2e 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) return; default: netif_dbg(pegasus, rx_err, net, "RX status %d\n", status); - goto goon; } - if (!count || count < 4) - goto goon; - - rx_status = buf[count - 2]; - if (rx_status & 0x1e) { - netif_dbg(pegasus, rx_err, net, - "RX packet error %x\n", rx_status); - pegasus->stats.rx_errors++; - if (rx_status & 0x06) /* long or runt */ - pegasus->stats.rx_length_errors++; - if (rx_status & 0x08) - pegasus->stats.rx_crc_errors++; - if (rx_status & 0x10) /* extra bits */ - pegasus->stats.rx_frame_errors++; - goto goon; - } - if (pegasus->chip == 0x8513) { - pkt_len = le32_to_cpu(*(__le32 *)urb->transfer_buffer); - pkt_len &= 0x0fff; - pegasus->rx_skb->data += 2; - } else { - pkt_len = buf[count - 3] << 8; - pkt_len += buf[count - 4]; - pkt_len &= 0xfff; - pkt_len -= 4; - } - - /* - * If the packet is unreasonably long, quietly drop it rather than - * kernel panicing by calling skb_put. - */ - if (pkt_len > PEGASUS_MTU) - goto goon; - - /* - * at this point we are sure pegasus->rx_skb != NULL - * so we go ahead and pass up the packet. - */ - skb_put(pegasus->rx_skb, pkt_len); - pegasus->rx_skb->protocol = eth_type_trans(pegasus->rx_skb, net); - netif_rx(pegasus->rx_skb); - pegasus->stats.rx_packets++; - pegasus->stats.rx_bytes += pkt_len; - - if (pegasus->flags & PEGASUS_UNPLUG) - return; - - pegasus->rx_skb = __netdev_alloc_skb_ip_align(pegasus->net, PEGASUS_MTU, - GFP_ATOMIC); - - if (pegasus->rx_skb == NULL) - goto tl_sched; goon: usb_fill_bulk_urb(pegasus->rx_urb, pegasus->usb, usb_rcvbulkpipe(pegasus->usb, 1), -- 2.1.4 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Heinrich Schuchardt Subject: [PATCH 1/1] net: pegasus: remove dead coding Date: Wed, 18 May 2016 02:13:30 +0200 Message-ID: <1463530410-12772-1-git-send-email-xypron.glpk@gmx.de> Cc: linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Heinrich Schuchardt To: Petko Manolov Return-path: Sender: linux-usb-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-Id: netdev.vger.kernel.org (!count || count < 4) is always true. So let's remove the coding which is dead at least since 2005. Signed-off-by: Heinrich Schuchardt --- drivers/net/usb/pegasus.c | 53 ----------------------------------------------- 1 file changed, 53 deletions(-) diff --git a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c index 36cd7f0..1903d2e 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) return; default: netif_dbg(pegasus, rx_err, net, "RX status %d\n", status); - goto goon; } - if (!count || count < 4) - goto goon; - - rx_status = buf[count - 2]; - if (rx_status & 0x1e) { - netif_dbg(pegasus, rx_err, net, - "RX packet error %x\n", rx_status); - pegasus->stats.rx_errors++; - if (rx_status & 0x06) /* long or runt */ - pegasus->stats.rx_length_errors++; - if (rx_status & 0x08) - pegasus->stats.rx_crc_errors++; - if (rx_status & 0x10) /* extra bits */ - pegasus->stats.rx_frame_errors++; - goto goon; - } - if (pegasus->chip == 0x8513) { - pkt_len = le32_to_cpu(*(__le32 *)urb->transfer_buffer); - pkt_len &= 0x0fff; - pegasus->rx_skb->data += 2; - } else { - pkt_len = buf[count - 3] << 8; - pkt_len += buf[count - 4]; - pkt_len &= 0xfff; - pkt_len -= 4; - } - - /* - * If the packet is unreasonably long, quietly drop it rather than - * kernel panicing by calling skb_put. - */ - if (pkt_len > PEGASUS_MTU) - goto goon; - - /* - * at this point we are sure pegasus->rx_skb != NULL - * so we go ahead and pass up the packet. - */ - skb_put(pegasus->rx_skb, pkt_len); - pegasus->rx_skb->protocol = eth_type_trans(pegasus->rx_skb, net); - netif_rx(pegasus->rx_skb); - pegasus->stats.rx_packets++; - pegasus->stats.rx_bytes += pkt_len; - - if (pegasus->flags & PEGASUS_UNPLUG) - return; - - pegasus->rx_skb = __netdev_alloc_skb_ip_align(pegasus->net, PEGASUS_MTU, - GFP_ATOMIC);