From patchwork Mon Sep 3 17:12:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 965535 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=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=i2se.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 4242Jh1qpTz9sT6 for ; Tue, 4 Sep 2018 06:54:28 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729268AbeICVev (ORCPT ); Mon, 3 Sep 2018 17:34:51 -0400 Received: from mout.kundenserver.de ([212.227.17.13]:44411 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728009AbeICVeG (ORCPT ); Mon, 3 Sep 2018 17:34:06 -0400 Received: from localhost.localdomain ([37.4.249.97]) by mrelayeu.kundenserver.de (mreue105 [212.227.15.183]) with ESMTPSA (Nemesis) id 0MANKs-1g3yt827o2-00BbCa; Mon, 03 Sep 2018 19:12:56 +0200 From: Stefan Wahren To: Woojung Huh Cc: Microchip Linux Driver Support , "David S. Miller" , netdev@vger.kernel.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Stefan Wahren Subject: [PATCH 1/4 next] net: lan78xx: Bail out if lan78xx_get_endpoints fails Date: Mon, 3 Sep 2018 19:12:36 +0200 Message-Id: <1535994759-8938-2-git-send-email-stefan.wahren@i2se.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1535994759-8938-1-git-send-email-stefan.wahren@i2se.com> References: <1535994759-8938-1-git-send-email-stefan.wahren@i2se.com> X-Provags-ID: V03:K1:BL4mbsVup+oTe9EvMq/D8jhxS4LWLU2qYp6W7/Kk2gLsufXX9j4 Q6qdE30ETptW/wy5dSsnze3bMzJYP1nF9tAHGT0gvdY5LonBjdWxh1zPC9PL/eALqJhyzwA STmZ4FAsNhuPVmGm9eB/YdEmVzbUn1OA6Azlgo8u85QysZzT0xJYPiYavNkvWp+HUjjVzOH ewxbuZdsuP5KFiUK0hg5A== X-UI-Out-Filterresults: notjunk:1; V01:K0:Te/p+sDip7Q=:CgIwKBBM/7R2VYUQOO9r5B /WuyyL7n3/u0388erubDhCY4vtwQJlckHHGvHjRQZVKVj2SY7HQk64G/eZQx3dP2C267IVeIO EySWq67M1wDidfteA2e66ZfUmAiB3Kp3lbdydILELdyKc/dHzy7vJT/m9x6LtVUILH4o9tGsb P59ddnPkMacM5RtLvwE7ikcTOrO64QhPwAwnj0p4eZuDsbDaxphuDuqEE/RuLCFj1QAy1LJYv WhbjYAiJyJXh0tt14pCZRwA7UvMTZKgpZUqAuVguBsmTjPERfFtg17J7k07jOr0Xz4e1Uss90 KKIWpObPtSFNJSEsS4cWINUGD39mN9dEGh5gOeycU1EitYbULeHblEuidH6kznrtO/g99jMID gYRtzzeuxt5DsrGrINKU7y5ULenSKiBn53mSPsFSWfHBm5yphufvqAYzwu0P42PxiCJHw0V+N ofASIb82LV7Ul5dm51xRLjAgmPM69ALPlUdlmwSiC4+oPXIliHVxdB4HfOb3Q9XuQguTMQiRd dLfvs+vp6+xPMBe0R6c5atzllW5KL7rydyRJ+mhX+VE+1gCmw+YlF+F5jGxFgSD+9N5DINdPC u9M06oZQp/8p3Cp4qgLflJ3rUhqAGTtc3TOo04VRFqLW8xE1D8NwuZSHP+t68oYKBqf63kXpK sxb0kja5PMBVdDFpg88Ez/CCsjCQ/h1P1X0PX682i5D7ZMk3oPF0FI1kseO/I7f4KPhw= Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org We need to bail out if lan78xx_get_endpoints() fails, otherwise the result is overwritten. Fixes: 55d7de9de6c3 ("Microchip's LAN7800 family USB 2/3 to 10/100/1000 Ethernet") Signed-off-by: Stefan Wahren Reviewed-by: Raghuram Chary Jallipalli --- drivers/net/usb/lan78xx.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c index a9991c5..3f70b94 100644 --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c @@ -2952,6 +2952,11 @@ static int lan78xx_bind(struct lan78xx_net *dev, struct usb_interface *intf) int i; ret = lan78xx_get_endpoints(dev, intf); + if (ret) { + netdev_warn(dev->net, "lan78xx_get_endpoints failed: %d\n", + ret); + return ret; + } dev->data[0] = (unsigned long)kzalloc(sizeof(*pdata), GFP_KERNEL); From patchwork Mon Sep 3 17:12:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 965533 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=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=i2se.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 4242JY4WZBz9sT6 for ; Tue, 4 Sep 2018 06:54:21 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729489AbeICVeM (ORCPT ); Mon, 3 Sep 2018 17:34:12 -0400 Received: from mout.kundenserver.de ([217.72.192.74]:46269 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728548AbeICVeL (ORCPT ); Mon, 3 Sep 2018 17:34:11 -0400 Received: from localhost.localdomain ([37.4.249.97]) by mrelayeu.kundenserver.de (mreue105 [212.227.15.183]) with ESMTPSA (Nemesis) id 0LoIBN-1fPkRN3Zbl-00gEw7; Mon, 03 Sep 2018 19:12:56 +0200 From: Stefan Wahren To: Woojung Huh Cc: Microchip Linux Driver Support , "David S. Miller" , netdev@vger.kernel.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Stefan Wahren Subject: [PATCH 2/4 next] net: lan78xx: Drop unnecessary strcpy in lan78xx_probe Date: Mon, 3 Sep 2018 19:12:37 +0200 Message-Id: <1535994759-8938-3-git-send-email-stefan.wahren@i2se.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1535994759-8938-1-git-send-email-stefan.wahren@i2se.com> References: <1535994759-8938-1-git-send-email-stefan.wahren@i2se.com> X-Provags-ID: V03:K1:dP6QZtZYzbdKIE6oE3N8dDZScw/W4mGynwDISB3H9147qWLNu6q V4A6u2nvpad70NzAW4kqkUB3mv0bJbArwhnkvPlFZST9YRseTlNbrXFpEjiqzwxq1G3L5YB EOYyt2FIiiDs/7Fml7BECkImq6iGhgLRWJE4Q/JZbLKcxYcfLKWCwAue1o8hBEuESlbAOSF EgTc6p5W/knjLfh0CE4Mw== X-UI-Out-Filterresults: notjunk:1; V01:K0:95DVrgEnyyY=:ZxKls4R0GdnLGDTbB5OoNY oUmHK1d5fv2uXSPN0IWc4h7chEizACn1/i3nPsJvc2dRUp5LYTF+rgYu4lrQikhnFAHXPQrys 9e9JAU3qqVy9MYWLTp5uJCIGDxpCXNxN6bKHKDhVkB72LabEtQYwyL0tcNoNQuL6cLgWA7ebx VgNAo6Ii+4AoObE9rWJVXdNFIldWbC82WiYoio+hRxoPVQROU0sFbIADnxi7cGVBbSqTl43kc gADI7V/eIVmw6jkFDmxP1/exURgU159WDFpV2xVpsmuXe2SfuHakXID1fWr+LVlNK99IVIuE1 x1WDwtSrIAhlc0apYFg3/6LFQyay2ZCnFRvS50fdgZDqdpeidfTxmI3SRWtGlXTJzKTTczoqm JUAy0i4Q3mr7D538yty3MUO3k+aWOgsGwM/IGQRyD5jIiuaua+L57Zq1XQiZwsYOz3n3thsBw aY3r287/ZA28wHoOwia0NRIXp6eOwCX5JGY0x0ZdWYMFINYILfR3D2a9HYqoH3MjpFyByFQuX dTijet5RcnyhR1Mxo571JMQaerdHg36CyFM9aywOrE3VKwOTNGJ4FlNPu2xOGCmUUpXfOpCjL yW8zCuur1pK279nVJfm0OLMLiMrgtmOqb4weFpOy3KBDU3lfoUYqUSdCYWQ6i0G88nM6/ig1U agMs0PXh+OWaY2jCQbQH/o3RPvt8/0t9HXRK9NANsnqlEeRPPxZ514Rb9hyD2t6Qn6eg= Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org There is no need for this strcpy because alloc_etherdev() already does this job. Signed-off-by: Stefan Wahren Reviewed-by: Raghuram Chary Jallipalli --- drivers/net/usb/lan78xx.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c index 3f70b94..3d505c2 100644 --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c @@ -3766,7 +3766,6 @@ static int lan78xx_probe(struct usb_interface *intf, ret = lan78xx_bind(dev, intf); if (ret < 0) goto out2; - strcpy(netdev->name, "eth%d"); if (netdev->mtu > (dev->hard_mtu - netdev->hard_header_len)) netdev->mtu = dev->hard_mtu - netdev->hard_header_len; From patchwork Mon Sep 3 17:12:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 965532 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=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=i2se.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 4242JV6Nn4z9tkd for ; Tue, 4 Sep 2018 06:54:18 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729314AbeICVeH (ORCPT ); Mon, 3 Sep 2018 17:34:07 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:36871 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727860AbeICVeG (ORCPT ); Mon, 3 Sep 2018 17:34:06 -0400 Received: from localhost.localdomain ([37.4.249.97]) by mrelayeu.kundenserver.de (mreue105 [212.227.15.183]) with ESMTPSA (Nemesis) id 0McEmF-1gDaDG0o23-00JasP; Mon, 03 Sep 2018 19:12:57 +0200 From: Stefan Wahren To: Woojung Huh Cc: Microchip Linux Driver Support , "David S. Miller" , netdev@vger.kernel.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Stefan Wahren Subject: [PATCH 3/4 next] net: lan78xx: Switch to SPDX identifier Date: Mon, 3 Sep 2018 19:12:38 +0200 Message-Id: <1535994759-8938-4-git-send-email-stefan.wahren@i2se.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1535994759-8938-1-git-send-email-stefan.wahren@i2se.com> References: <1535994759-8938-1-git-send-email-stefan.wahren@i2se.com> X-Provags-ID: V03:K1:hZmG4Xkexm6DlL2hMPNBbCAjpZl1xIjUNcKknMZOWIZj09mha++ p/s/W43AZxY9Si+nDqJcxRhWNndj6qSjEyXpMdlUgyQPMLu+13Ks2WDlxZ66xmyV9fjbFK7 yjuugD1gRbR3bidN+QkpOBkS194Eindl+a/taJkttkpU+80K0kbFo3uprLm0WPErpv82+tg DMOSG50212OUMCUHv1KIQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:Ps3qeWIQbBg=:SPCke+RSOnkNLeSqxPRrsy wZk6KPc/f13lpR+T7lDdV6pvi1+1XbIh9MRPkfyqCYb5nRmpl+DaFCX1mknvCAQFu5gJsYUpo nWxC0gANwnh/d4RO6J2QP+dZHgYj9LowFV0wDiNUnpz4MfqZOq0gnRBLB+O6xfFkZ3BpbDuLU IIXvkFBbCycYx9PdiJgl2zNMre1WORnmt3MpFPjS3fVg1Fa/YQqKR3j3xzXbv9H5LvAugFnqO +W31F+2PHOdMqeufSoZPLAbuv2vQWc5Elt5wZ5k7l+N5Khim35c8h0JHw/WPJedg9vbXzAwxT l3zoKf1p+NAcPpmOcjAMjzoZkGmZX3qs6zoWrcoAxBwriHKqjEai08QvjBvQ2e+MAYsYhX9LD 2rk5M0EfsPXqeTh+3ARHVvA1ZZP/0fY63Kjv1MeKRMuutGgc1Yp85l7a7rWgeN2yKENcyeg9a LWZ82YOMNRoVfRQweGNly8udtmVIZHUWPNYRg80izSuEJ6KYVjgKnRK797GwuCTHgzwIryRBl Ex6SUF3PDrbvebOAGcKMIaNy30cJ5xiXfvScYnVf/jsKUgEeLCpw7ulVDogEpZljwwnzrIqrr 0/dj6Rb7G0FOvPZUMAx4Kx9GzVCbetimj4eIyE4ddhzGQgBF9LqW70CUPqzfThpsndlWXm23u lKnWaIFIKfW6FstY1+JIyNP8xH5kt4mF6/qF4fmNRPZVjzfhbljVeRz6MZo0w5X9tzxM= Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Adopt the SPDX license identifier headers to ease license compliance management. Signed-off-by: Stefan Wahren --- drivers/net/usb/lan78xx.c | 18 ++---------------- drivers/net/usb/lan78xx.h | 18 ++---------------- 2 files changed, 4 insertions(+), 32 deletions(-) diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c index 3d505c2..a6e88a4 100644 --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c @@ -1,19 +1,5 @@ -/* - * Copyright (C) 2015 Microchip Technology - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, see . - */ +// SPDX-License-Identifier: GPL-2.0+ +/* Copyright (C) 2015 Microchip Technology */ #include #include #include diff --git a/drivers/net/usb/lan78xx.h b/drivers/net/usb/lan78xx.h index 25aa546..e65cb54 100644 --- a/drivers/net/usb/lan78xx.h +++ b/drivers/net/usb/lan78xx.h @@ -1,19 +1,5 @@ -/* - * Copyright (C) 2015 Microchip Technology - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, see . - */ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* Copyright (C) 2015 Microchip Technology */ #ifndef _LAN78XX_H #define _LAN78XX_H From patchwork Mon Sep 3 17:12:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 965531 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=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=i2se.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 4242JV0Rt9z9sCR for ; Tue, 4 Sep 2018 06:54:18 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729464AbeICVeH (ORCPT ); Mon, 3 Sep 2018 17:34:07 -0400 Received: from mout.kundenserver.de ([217.72.192.75]:37897 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728548AbeICVeG (ORCPT ); Mon, 3 Sep 2018 17:34:06 -0400 Received: from localhost.localdomain ([37.4.249.97]) by mrelayeu.kundenserver.de (mreue105 [212.227.15.183]) with ESMTPSA (Nemesis) id 0MAeJn-1g3hly2Drn-00BsBV; Mon, 03 Sep 2018 19:12:57 +0200 From: Stefan Wahren To: Woojung Huh Cc: Microchip Linux Driver Support , "David S. Miller" , netdev@vger.kernel.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Stefan Wahren Subject: [PATCH 4/4 next] net: lan78xx: Make declaration style consistent Date: Mon, 3 Sep 2018 19:12:39 +0200 Message-Id: <1535994759-8938-5-git-send-email-stefan.wahren@i2se.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1535994759-8938-1-git-send-email-stefan.wahren@i2se.com> References: <1535994759-8938-1-git-send-email-stefan.wahren@i2se.com> X-Provags-ID: V03:K1:pSquybRud8rBJ81+pXBAwOSU+4FRWjdY30Kx4NhF4jHUTSEAjef JlReTztAtOMTG3JLFzPc/o9OTA3jQoWk7EaFbDZafPB56HSNiYXV9wBfG3+hHyPps2Lq2Ix 6z3Rb6A1wdbEbVKZkvV1Dk6KTGZ65/0dRR4vYFHwrg0aeBAqoWFl0KqlCoF1AvKxOt/F0sw r35eEsecIS34muzf0nETQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:PpMvpzFP5v8=:WGXL5zKZdNriZGUFU49GYn M4WY7BolOO53SV4OCez+jmY2XlIcj4wM6ee7UV/HKZ7q6QTIwJ79DBuIx4l5Gilu5xhiLWgm/ niwcZfeaDunobP/EKI91AAKZ7rPAU3SPVZI6mTgMlBtFT1E8RmCWh4gpNFr2oqZ9R7tEdx6fU XiagKuYoFJ5j0P9zrqcTF0aUgpL7qvl1BHw0r0Xh19Rqxhoujlmpk5Dj5t8zAUqYL4jaLkXv+ f8P5EMZkun+YJWwXy9mVJ/iAsmhIMUTf5O89Go/HeudL3jYbv1xeNmkLKinbQjSNr7F137uC7 dK6oDkcmU5N9K98TCsWZ2bOkZs8ggHuYce38zzRBRN1bfFzPmbsPn+nhHNaMVo+hgM34q4WUR UZsIOrmR2qvPuTq6Ytnwbb0gIBATTBu9VneMPX4NWeFFXOtbnW/yBhTPpESlBNkDBvMBVj8Xk lKOy64YcmjTg5W8VFWPJbcT3LsPmWC30Ivucuuix+No3aE+rAelD7Q1Ip5TiP8rl+hZKT1d5Y bVl6kvf0v78uEMCrCjipnxfxbOZz72IyO/qGda51jZGzl5CCmyzV5oC8aTVcGvuVTS6/4GiP5 szxANS2642nVnBHCI+zGw6bjfAprJhh9DYr+lkh/gcT0KaStouDU7osJ2trPqwM6JkwubA3xs SzY7YR4mMUEwS6ulMX6B3zF/3tfhBi6smczg/UOWP878CZdybNz7e4zLph/7HR3TaCM8= Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch makes some declaration more consistent. Signed-off-by: Stefan Wahren Reviewed-by: Raghuram Chary Jallipalli --- drivers/net/usb/lan78xx.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c index a6e88a4..143091a 100644 --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c @@ -1013,7 +1013,7 @@ static int lan78xx_dataport_write(struct lan78xx_net *dev, u32 ram_select, static void lan78xx_set_addr_filter(struct lan78xx_priv *pdata, int index, u8 addr[ETH_ALEN]) { - u32 temp; + u32 temp; if ((pdata) && (index > 0) && (index < NUM_OF_MAF)) { temp = addr[3]; @@ -2688,7 +2688,7 @@ static void lan78xx_terminate_urbs(struct lan78xx_net *dev) static int lan78xx_stop(struct net_device *net) { - struct lan78xx_net *dev = netdev_priv(net); + struct lan78xx_net *dev = netdev_priv(net); if (timer_pending(&dev->stat_monitor)) del_timer_sync(&dev->stat_monitor); @@ -3071,7 +3071,7 @@ static void lan78xx_rx_vlan_offload(struct lan78xx_net *dev, static void lan78xx_skb_return(struct lan78xx_net *dev, struct sk_buff *skb) { - int status; + int status; if (test_bit(EVENT_RX_PAUSED, &dev->flags)) { skb_queue_tail(&dev->rxq_pause, skb); @@ -3631,10 +3631,10 @@ static void intr_complete(struct urb *urb) static void lan78xx_disconnect(struct usb_interface *intf) { - struct lan78xx_net *dev; - struct usb_device *udev; - struct net_device *net; - struct phy_device *phydev; + struct lan78xx_net *dev; + struct usb_device *udev; + struct net_device *net; + struct phy_device *phydev; dev = usb_get_intfdata(intf); usb_set_intfdata(intf, NULL);