From patchwork Wed Jul 1 13:08:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Claudiu Beznea X-Patchwork-Id: 1320465 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=quarantine dis=none) header.from=microchip.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=microchip.com header.i=@microchip.com header.a=rsa-sha256 header.s=mchp header.b=D50CgX7O; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49xhQM2S4fz9sTY for ; Wed, 1 Jul 2020 23:09:31 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730742AbgGANJH (ORCPT ); Wed, 1 Jul 2020 09:09:07 -0400 Received: from esa1.microchip.iphmx.com ([68.232.147.91]:33522 "EHLO esa1.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728269AbgGANJC (ORCPT ); Wed, 1 Jul 2020 09:09:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1593608942; x=1625144942; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=F0v7d59d8CodmqYQV4UE6rEu9k/83Ok33vbIFw5OEbM=; b=D50CgX7OIuW/Bio8GIOBhsOAuLPb8VCHufaJzhIRAGeRV4+/OuNzEItq vg6Ai86SDc9t2HxTaw255UKTtdu5GX5vjPJE32WUv3TICZNDFFlDBKAn6 rGzuRggruvFvBf4GtCKRb0pEQLH2DF4MVDj+gEu4qJq9c3kTs+CILpPP0 QWxiumUWeagLn1SyYGcv749yhQQv1W8IEQhJKRAVneKADaJm97SCPNK2m VrKrWhFVK3XHlRK37bMLZv03aYfoBonn0fVwnuqjpOLydvVRbVVrkNUVP Ap7SBEfzO2BFbd0b6TzS+Mjhii+7a9Vb/5QW8DVFPPgX7s8CkzJP0vYeu A==; IronPort-SDR: DFW2gmCmg6FYGBod7jc0ouwNHPnGC6wxV22JgWmCNcdqQ6DM7HjxnkWU6NHzyzIVQEtSr8Nnu4 1CQ+LJMuRgCOUBg+29TC+P2x67H5rP0bcRiSvSHzmCSXSelmKQCh5sIM5OQVAgm4nluEC4owDk byvudokhP0v94OlZVIVrsLpQj8Y9C2hiDiRHtSngG/EXC2TyHy6fUiYKUH2EQHM04PsSsPW6is TFO0Zo67sMBzNXZvovNNvsVDgw4lUhA+e7CH20/cWookqisFH6I2gp5cfAsDNQAfvyieYUlGuG g2E= X-IronPort-AV: E=Sophos;i="5.75,300,1589266800"; d="scan'208";a="85819358" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa1.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 01 Jul 2020 06:09:00 -0700 Received: from chn-vm-ex04.mchp-main.com (10.10.85.152) by chn-vm-ex02.mchp-main.com (10.10.85.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1979.3; Wed, 1 Jul 2020 06:08:41 -0700 Received: from m18063-ThinkPad-T460p.microchip.com (10.10.115.15) by chn-vm-ex04.mchp-main.com (10.10.85.152) with Microsoft SMTP Server id 15.1.1979.3 via Frontend Transport; Wed, 1 Jul 2020 06:08:57 -0700 From: Claudiu Beznea To: , , CC: , , Claudiu Beznea Subject: [PATCH net-next 1/4] net: macb: do not set again bit 0 of queue_mask Date: Wed, 1 Jul 2020 16:08:48 +0300 Message-ID: <1593608931-3718-2-git-send-email-claudiu.beznea@microchip.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1593608931-3718-1-git-send-email-claudiu.beznea@microchip.com> References: <1593608931-3718-1-git-send-email-claudiu.beznea@microchip.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Bit 0 of queue_mask is set at the beginning of macb_probe_queues() function. Do not set it again after reading DGFG6 but instead use "|=" operator. Signed-off-by: Claudiu Beznea --- drivers/net/ethernet/cadence/macb_main.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c index 52582e8ed90e..1bc2810f3dc4 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -3497,9 +3497,7 @@ static void macb_probe_queues(void __iomem *mem, return; /* bit 0 is never set but queue 0 always exists */ - *queue_mask = readl_relaxed(mem + GEM_DCFG6) & 0xff; - - *queue_mask |= 0x1; + *queue_mask |= readl_relaxed(mem + GEM_DCFG6) & 0xff; for (hw_q = 1; hw_q < MACB_MAX_QUEUES; ++hw_q) if (*queue_mask & (1 << hw_q)) From patchwork Wed Jul 1 13:08:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Claudiu Beznea X-Patchwork-Id: 1320462 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=quarantine dis=none) header.from=microchip.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=microchip.com header.i=@microchip.com header.a=rsa-sha256 header.s=mchp header.b=kR+sTApW; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49xhQ207p6z9sTY for ; Wed, 1 Jul 2020 23:09:14 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730796AbgGANJI (ORCPT ); Wed, 1 Jul 2020 09:09:08 -0400 Received: from esa4.microchip.iphmx.com ([68.232.154.123]:19142 "EHLO esa4.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730656AbgGANJF (ORCPT ); Wed, 1 Jul 2020 09:09:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1593608945; x=1625144945; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=XzCEHryWqOM5CL+btlhdGuzPRS8MM+9xlY7gzr5UCZE=; b=kR+sTApWuNADAsAsYtrJKvC0DlNf25MD83qPI4/Jx4JRAoWNHolY2W8g U7Ny9rV6MXSVmwAuQXbWHzGnVoDs9M4MS9zHtRloGFkHGk+fePFGTa0le l3G5K9uSvGPFTQiCS0fAJkDM7ie34TJssYxMnHXy8+9AXG8M/PXPOGUea FZxlXOERamkhDDJT48vFfOPV3S1iGTNM5Qy55PLsS2p5FblphtBkVE8St B42gUpwjzqML88HkZBHeefJVjl9Rfu9FxFM0VSkyFW8CLZigWZxqf3dXp BeBCFb+mHxDPWi/e6LrsoBlwqwUEe3WWKgSFvzI0dixTToWFFEI2BqU/J A==; IronPort-SDR: Ph9bDs0MmLYfgNTOtupzXCfFlSYUyJG3aHxlcZbtjoMvW/bEPUheGixMLiWC+y2UNnENXfiozI W79bSBwIzFb/SEIbDuBnMUVFDRSJCFXfJHe3Y+w5W4hxmagk0tuAXtZnKrDYqvoQI9QjEZ7Jqh FQUHYEdlblaOm0ytzi6ifo12swZmJttOmK8BElDG8GANxCdIixrZDNtwysordHQLL3mCsgV6df zLSfc41ZopWDJ0/AMXxeqpwFZ7dsO5M5uW+IyePMgyXbLJvN8klcbK/q0Mqvuv1HuinZh/1m0I G4I= X-IronPort-AV: E=Sophos;i="5.75,300,1589266800"; d="scan'208";a="78416751" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa4.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 01 Jul 2020 06:09:04 -0700 Received: from chn-vm-ex04.mchp-main.com (10.10.85.152) by chn-vm-ex03.mchp-main.com (10.10.85.151) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1979.3; Wed, 1 Jul 2020 06:09:03 -0700 Received: from m18063-ThinkPad-T460p.microchip.com (10.10.115.15) by chn-vm-ex04.mchp-main.com (10.10.85.152) with Microsoft SMTP Server id 15.1.1979.3 via Frontend Transport; Wed, 1 Jul 2020 06:09:01 -0700 From: Claudiu Beznea To: , , CC: , , Claudiu Beznea Subject: [PATCH net-next 2/4] net: macb: use hweight_long() to count set bits in queue_mask Date: Wed, 1 Jul 2020 16:08:49 +0300 Message-ID: <1593608931-3718-3-git-send-email-claudiu.beznea@microchip.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1593608931-3718-1-git-send-email-claudiu.beznea@microchip.com> References: <1593608931-3718-1-git-send-email-claudiu.beznea@microchip.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Use hweight_long() to count set bits in queue_mask. Signed-off-by: Claudiu Beznea --- drivers/net/ethernet/cadence/macb_main.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c index 1bc2810f3dc4..a84fb0ec53f0 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -3482,8 +3482,6 @@ static void macb_probe_queues(void __iomem *mem, unsigned int *queue_mask, unsigned int *num_queues) { - unsigned int hw_q; - *queue_mask = 0x1; *num_queues = 1; @@ -3498,10 +3496,7 @@ static void macb_probe_queues(void __iomem *mem, /* bit 0 is never set but queue 0 always exists */ *queue_mask |= readl_relaxed(mem + GEM_DCFG6) & 0xff; - - for (hw_q = 1; hw_q < MACB_MAX_QUEUES; ++hw_q) - if (*queue_mask & (1 << hw_q)) - (*num_queues)++; + *num_queues = hweight_long(*queue_mask); } static int macb_clk_init(struct platform_device *pdev, struct clk **pclk, From patchwork Wed Jul 1 13:08:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Claudiu Beznea X-Patchwork-Id: 1320463 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=quarantine dis=none) header.from=microchip.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=microchip.com header.i=@microchip.com header.a=rsa-sha256 header.s=mchp header.b=stGgyoux; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49xhQ821bWz9sQt for ; Wed, 1 Jul 2020 23:09:20 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730858AbgGANJS (ORCPT ); Wed, 1 Jul 2020 09:09:18 -0400 Received: from esa5.microchip.iphmx.com ([216.71.150.166]:32587 "EHLO esa5.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730656AbgGANJN (ORCPT ); Wed, 1 Jul 2020 09:09:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1593608953; x=1625144953; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=yZXM5jwTj3IjGvPe3sjNrDrjgeA8OBDnvK5TxI3UrD8=; b=stGgyoux4j3sBmVxvDfVUhowway3+uP5OVCqY0KZyCg0nfXSW7+N+I+J 7yboMbh+tFz7kGAPrhKc7BHVlREMhA/ak+v34415TOCDx1+85DW9tHxoY vZveqZ9D5rHx0KM4c0a9ZwXZdrlLiZw4gmqzcCV34rQ+r/nLE4ApMOCka JeCa6dUBS/2qr8G1mU6sT4rMxehiiLGykumTMlk+xrw33QpnDgat/edfd InjURX07iS3/GscPHERZ2b5blyzNGoJfcvQOjGH+XFiUYBROruja7bxIr A/WrMKSlIwPez9W3zZsSo0JJQnU3XG3RkQ02sXWvNuAC9IHcJg959BHR4 g==; IronPort-SDR: ms0NRyaYJQ2bEzckjxXrXToHmwtv8gh4I9vxSltGZvu+S8KsayTcwGwjEIVqRO4aYP4whliy+x 0ydU5OyDv6GCYc3pMKxTXChhlQvY+xklEiyHXEP+eN33QmkQHQ2OhzIuubp+4FUz/wf1pZKX3B sj7zq3l+lvK5sIR0EyRrm82IneqO97GyYvgNuO9ltTGGj75OiaAzam17g06MEb+7SZoBivZ/is NiLqaZLPjsO570Zc/JHaKaU7hsKx1pFfKVfLn8JiMaWweuyd+WAMQ8ku0C6ahFwEiC3eW2r0G8 ytI= X-IronPort-AV: E=Sophos;i="5.75,300,1589266800"; d="scan'208";a="81529535" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa5.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 01 Jul 2020 06:09:10 -0700 Received: from chn-vm-ex04.mchp-main.com (10.10.85.152) by chn-vm-ex04.mchp-main.com (10.10.85.152) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1979.3; Wed, 1 Jul 2020 06:09:06 -0700 Received: from m18063-ThinkPad-T460p.microchip.com (10.10.115.15) by chn-vm-ex04.mchp-main.com (10.10.85.152) with Microsoft SMTP Server id 15.1.1979.3 via Frontend Transport; Wed, 1 Jul 2020 06:09:04 -0700 From: Claudiu Beznea To: , , CC: , , Claudiu Beznea Subject: [PATCH net-next 3/4] net: macb: do not initialize queue variable Date: Wed, 1 Jul 2020 16:08:50 +0300 Message-ID: <1593608931-3718-4-git-send-email-claudiu.beznea@microchip.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1593608931-3718-1-git-send-email-claudiu.beznea@microchip.com> References: <1593608931-3718-1-git-send-email-claudiu.beznea@microchip.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Do not initialize queue variable. It is already initialized in for loops. Signed-off-by: Claudiu Beznea --- drivers/net/ethernet/cadence/macb_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c index a84fb0ec53f0..3603ab707e0f 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -1467,7 +1467,7 @@ static void macb_hresp_error_task(unsigned long data) { struct macb *bp = (struct macb *)data; struct net_device *dev = bp->dev; - struct macb_queue *queue = bp->queues; + struct macb_queue *queue; unsigned int q; u32 ctrl; From patchwork Wed Jul 1 13:08:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Claudiu Beznea X-Patchwork-Id: 1320464 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=quarantine dis=none) header.from=microchip.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=microchip.com header.i=@microchip.com header.a=rsa-sha256 header.s=mchp header.b=1oqn7WJu; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 49xhQ92lKnz9sQt for ; Wed, 1 Jul 2020 23:09:21 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730881AbgGANJT (ORCPT ); Wed, 1 Jul 2020 09:09:19 -0400 Received: from esa5.microchip.iphmx.com ([216.71.150.166]:32587 "EHLO esa5.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729402AbgGANJP (ORCPT ); Wed, 1 Jul 2020 09:09:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1593608956; x=1625144956; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=s42Du4fy5NBs3k4rUKT5UAKJ01NC2TLYOSaV8P+ljQQ=; b=1oqn7WJuxl1pv2fGShyUhWEtKNyqT/ueAfEZeLuMl4OzZc+L1rhEHCDo gLZGfiPTL6CJKsUUNmKLO4mzZdTH/9Mc5odDTowxsnmx7Pgs+vz1PuHXe JeeWfkkLQT1VYtBlqOtPqXeglcjQhTBIIc8gBNavqiHl6AKARgF+vyZpD 5I9mr8bQTghHboNuTlMIHwvZ4gM/YckHeL3cjUMiV0tKIjyO1za8tTaS2 fa3jmYhjHuw1XmyoSgcefkKuxjQQPDNSDY5vZ8Jm15XXqjFJ6xe3935wP JBhtJSNR7aOfl8sRvGwoXB0G/COCB1rx1b8+Dia18EjyWSGU/StCxMzOb Q==; IronPort-SDR: TUbdAMFTwHMlnO7qwylfeSNJJtIZwk6Ja71BbbAuQxP86iVDFZj+77afZHCPQJEB+MWop7O0kg t5GzuI3Gdj6Qaz7WRpvQ20hFlSgjNbhgshgBSI9YigCI/WelxXMph1itrlJl3/HK18jf0lLIKU k/W9jmyBHAZu00zw+DZdTG2qY/vGDI0/31Mk0yn/VERMVyJQ7IrMddSZzm4f0GnkZGb/Pjyzgf bEE1a2Ad2LzzCwo5KOcD8Gl+rl4QrftX2cDmtzf48v8JalE8L8HwBHnrt0KgqX1Ey6avzt83mG fiM= X-IronPort-AV: E=Sophos;i="5.75,300,1589266800"; d="scan'208";a="81529538" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa5.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 01 Jul 2020 06:09:11 -0700 Received: from chn-vm-ex04.mchp-main.com (10.10.85.152) by chn-vm-ex04.mchp-main.com (10.10.85.152) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1979.3; Wed, 1 Jul 2020 06:09:10 -0700 Received: from m18063-ThinkPad-T460p.microchip.com (10.10.115.15) by chn-vm-ex04.mchp-main.com (10.10.85.152) with Microsoft SMTP Server id 15.1.1979.3 via Frontend Transport; Wed, 1 Jul 2020 06:09:07 -0700 From: Claudiu Beznea To: , , CC: , , Claudiu Beznea Subject: [PATCH net-next 4/4] net: macb: remove is_udp variable Date: Wed, 1 Jul 2020 16:08:51 +0300 Message-ID: <1593608931-3718-5-git-send-email-claudiu.beznea@microchip.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1593608931-3718-1-git-send-email-claudiu.beznea@microchip.com> References: <1593608931-3718-1-git-send-email-claudiu.beznea@microchip.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Remove is_udp variable that is used in only one place and use ip_hdr(skb)->protocol == IPPROTO_UDP check instead. Signed-off-by: Claudiu Beznea --- drivers/net/ethernet/cadence/macb_main.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c index 3603ab707e0f..4e7317747f54 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -1933,7 +1933,7 @@ static netdev_tx_t macb_start_xmit(struct sk_buff *skb, struct net_device *dev) unsigned long flags; unsigned int desc_cnt, nr_frags, frag_size, f; unsigned int hdrlen; - bool is_lso, is_udp = 0; + bool is_lso; netdev_tx_t ret = NETDEV_TX_OK; if (macb_clear_csum(skb)) { @@ -1949,10 +1949,8 @@ static netdev_tx_t macb_start_xmit(struct sk_buff *skb, struct net_device *dev) is_lso = (skb_shinfo(skb)->gso_size != 0); if (is_lso) { - is_udp = !!(ip_hdr(skb)->protocol == IPPROTO_UDP); - /* length of headers */ - if (is_udp) + if (ip_hdr(skb)->protocol == IPPROTO_UDP) /* only queue eth + ip headers separately for UDP */ hdrlen = skb_transport_offset(skb); else