From patchwork Tue Sep 4 17:29:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 966028 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 424YkL52JSz9sDb for ; Wed, 5 Sep 2018 03:30:02 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727806AbeIDVzv (ORCPT ); Tue, 4 Sep 2018 17:55:51 -0400 Received: from mout.kundenserver.de ([217.72.192.74]:52579 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727272AbeIDVzu (ORCPT ); Tue, 4 Sep 2018 17:55:50 -0400 Received: from localhost.localdomain ([37.4.249.97]) by mrelayeu.kundenserver.de (mreue102 [212.227.15.183]) with ESMTPSA (Nemesis) id 0Lp7GG-1fREJi3M9c-00esIV; Tue, 04 Sep 2018 19:29:38 +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 V2 1/4 next] net: lan78xx: Bail out if lan78xx_get_endpoints fails Date: Tue, 4 Sep 2018 19:29:09 +0200 Message-Id: <1536082152-3669-2-git-send-email-stefan.wahren@i2se.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1536082152-3669-1-git-send-email-stefan.wahren@i2se.com> References: <1536082152-3669-1-git-send-email-stefan.wahren@i2se.com> X-Provags-ID: V03:K1:B/B9WzsyPV6JdCvAOS/Kzjn0ncEXoPUrMhptKGJjexecT1vqpOD eyu4RPmiCLJy63Uv9sCRjKqyAV7n+CafQ0+DCGZ/Wc9Jj2MByqinnxQRDe6fe48Qz3KIe9M +hyG8Fx8Zj3SOsxrCLo/TOwmjJnQHqt2NuXVMrzoxFOjP9FtgzF35lEip833g6HThWAaPgf On3HHCOaYF+UWPT7P2kmA== X-UI-Out-Filterresults: notjunk:1; V01:K0:LjWl2pm+5hk=:cbchJ6Zwyx6HaiJzUDXtO/ YIWPgF+pqkgCE5QD4LonANCoKQd5TzX3Aft3c+1FxWD3CqfkUHXX7XnjkGHX/CS3MNOp8+scD sFYEF7dut3niWECuuW1mQrWNEbmSRVgQgPhW1QF676WvAWfPpuDbnxwTmt8FT5Tusamcdexdo hIpEkvcKeBJLtW2PiVPBg90WDg/el197pZd7Zge5JmSrq7n5/A+w04bA5aaMU67o61JJUXxCI YHA/X/Hogqw9PLel/LIpu/Uobhe7g+7rIzFL840VnYAibpJSdw1kNFJfhBlm2E5f5cbcyFPtT QQcevy8t5pesSYUIcnFvxxtXO3hTrKuaro4UA4q0aSDQ4Io23f2CNR7jzycOl9aXY4FSi1ED8 96x4g4/sMhTzBd5TXyhq6hnpA4wExu/czpDu5fC4yeG9FSLWX2k26m7fcHjlr3O28KJ0kEdFc mOvK+DpzGzdOsD5JAJORoPy6B1zvIb15GEZP2WOudv+3jyLW3i0AdcJSiKMQa0iDdH/tIAs2H wPq7+KOhnGSeznVY0bppIeNxTOHHt76NWYvDrMo8RCUTfvjotHMlUGxSP90tO8A3MQV2ukmnx Q1hb3po9PS3UYm9p2FmHHxujpe8STz/8KVM/rM0bnARUwv975xhcTfXy7Hij+wkPhHV08zjvO 6Mc2VzhuaGbD6ZP4sYIbkv8Hk+CBCH4UanxrGxflNUv/+HMo99/qJ4wRXqJdIXXRZvOs= 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 Tue Sep 4 17:29:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 966031 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 424Ykf0Y1gz9sCw for ; Wed, 5 Sep 2018 03:30:18 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727688AbeIDVzu (ORCPT ); Tue, 4 Sep 2018 17:55:50 -0400 Received: from mout.kundenserver.de ([217.72.192.75]:34713 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727112AbeIDVzu (ORCPT ); Tue, 4 Sep 2018 17:55:50 -0400 Received: from localhost.localdomain ([37.4.249.97]) by mrelayeu.kundenserver.de (mreue102 [212.227.15.183]) with ESMTPSA (Nemesis) id 0LymAB-1frJvI0h5L-0168EC; Tue, 04 Sep 2018 19:29:39 +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 V2 2/4 next] net: lan78xx: Drop unnecessary strcpy in lan78xx_probe Date: Tue, 4 Sep 2018 19:29:10 +0200 Message-Id: <1536082152-3669-3-git-send-email-stefan.wahren@i2se.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1536082152-3669-1-git-send-email-stefan.wahren@i2se.com> References: <1536082152-3669-1-git-send-email-stefan.wahren@i2se.com> X-Provags-ID: V03:K1:TdohkElw0k24Z76YVoYY5v1Z1T15qULO/vptTLPe8f7DsAqu3g6 aO0VSMyGN9LT5RT9V2WGGHsOTfRCTr/VT4k+eb4P5OxVpGoYEU6UkumAOnEaB9gA3vKW4yU xxW7zsgK1FJoOFRobyA5cxEqUYvUBA9kfe7WRgMH/ZqZdBXN73leQOrGlPHbuJNwgx3MvVo +SHsnDmGx/9u4lrIM7BRg== X-UI-Out-Filterresults: notjunk:1; V01:K0:Z5UlGmUwGOU=:V4qEObedI1q6XIO6Akcqd/ AEDlx50j71tKMlj5JCS9PLLkRBG2QZ/8yfPgEGw5hoLVNpS8Ls6MZkNcKmPJyu1M61X0SxT4P XkwPZa8ZGYUM2eoJkn7mXLZV/HhD467SYSwf8IZJOjvMSddBngjUHKmxn1m430LGyhbx3UDBO HcIFE+PdgtG2uSu39qzC0Q9wFth3okFIFXp/X5Oz3D0AvHAw16moMuwghALQVpQu7gMfHzdQb PcpW08g0TjLuZ4hioUI6yYEHTwlgUjXM/3W+i3IF1cmTUIH0PDrgaPBk9/wspcerEWIBenB7B dW23qveMd1c8zlnmGd2cffj6QkENVY0fWEUqtbCtdwghIG77QQALdq9zDTN96zAZTsUX4rTet wFXoQWYjbW4K8IPIstUSAmM4+Lmf2raqMbb7lInJXCWXHDGgwIL9u3/4Y9OkI4hinV6vBtCjq 3C6QR1VytEbbX+ahMlNEeG/iAT2/HQyxN69u9VtMYgTttoU7W1F0t4p9Afdp2gdIH91kEB7Mc 34+a02PtRZpjWXc3Gla+O04Rv4eZ3WhHmogf0EUOAaj9Vj6aMPOsoKttE0/7fSDc5ugA4gv1X m8+5r+dwC+S19pfIPMlv2eEtSF9wpuo+JeujB6zfDyWzvm0E/J7HkoZnCM7hh1q+p9lIbNgkW z+gcvHfpj+y74pmXyKG2rzG6wuIM1/KSmmhoFZTnQxSQKfQe9lJdZRgCyMp/UpNNII3s= 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 Tue Sep 4 17:29:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 966032 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 424Ykl0xzTz9sBy for ; Wed, 5 Sep 2018 03:30:23 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727552AbeIDVzu (ORCPT ); Tue, 4 Sep 2018 17:55:50 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:33391 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727037AbeIDVzu (ORCPT ); Tue, 4 Sep 2018 17:55:50 -0400 Received: from localhost.localdomain ([37.4.249.97]) by mrelayeu.kundenserver.de (mreue102 [212.227.15.183]) with ESMTPSA (Nemesis) id 0MEmVu-1g7ksb2HGc-00FxPx; Tue, 04 Sep 2018 19:29:39 +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 V2 3/4 next] net: lan78xx: Switch to SPDX identifier Date: Tue, 4 Sep 2018 19:29:11 +0200 Message-Id: <1536082152-3669-4-git-send-email-stefan.wahren@i2se.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1536082152-3669-1-git-send-email-stefan.wahren@i2se.com> References: <1536082152-3669-1-git-send-email-stefan.wahren@i2se.com> X-Provags-ID: V03:K1:1L1OCBo2KXTeU8ZPU/mZzda47t/PixdybJ0u6jjwjS49ooYomZp jhwOBb0zjmqaJzWfQxDW8i8z88Zf7vtdqQYkS8oza0pDPve1Mn/A/NZ3Xegq+6Y1sY30JKl egW9lV28m+3Yajf5As9Md9MOSUHc/48vlF3VlpzayoszL5t7bJqTfPBzliKjESDtQA0X/+t c7Zj2sabXxRwhjr9YpR2g== X-UI-Out-Filterresults: notjunk:1; V01:K0:/hHFeL8gq24=:kDl/tv/3qdCtZ6+uSZYq2q d6SNWVyqIl3NyLvT8mSoHahJ3aX4CgHNXctdkkh88Y4DxSmEEdcpTX5HVRMrTqMF5g3E+lC51 egEZBjLiS16MGbQDdg9Avnw+uraS/5fbcbiZWDJmB4Dg0qbURydgfjuSvxmL7FieA/+Ag1WaJ q/dzUYUYYxoi76Po6NW6CezLhPItzMGE1Dh37pG9A6Wlol4CtAMU5LrkIOqq4xZED6ePDPaPi uVNEyS7JnSUPsNy8644rB+PKaidhvQStk+FLO+6Le7cY35j7r5YudFhjz8gYBmW7AKWjhxR57 0AgVMicnzf6eG4apsFLxkqEH7gfgdJjpYCslmTYaXaP/5pBjNqYj/n7WnluJvhUey1uvjNRGN +S1AA19pkjvIFyDPMKIwbdgqeMeIr+IuAtL9mRJe+kcRpngnzwe1ELojR5FkBylEVOlIwTTzr LWlqpxmOCAkZTFtsNg6KN2S9k21hISQW681RPv4VzCJvyqcJxyRCnJHAyut4Xfg0qyi6CHzR9 t+JWV3kgQKNfOcF5s96SnjRc6WNVIz9ULWvkPPWwvoI2TXBk9qZy21QprtHy3QHGaLc5FCEYm SzGzMer8FwRvPDWQEZVdbGzGQnD2cgabHmEVc1E5N53MnFrr/xxHLXJvxNBS4LBjNs5vdor01 uesiP/ce1Lsr6VaIrqM96mN/38uhsposGym/JMu/sIDU4eu0qt1Oulz7stA23H3CY1xQ= 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 | 14 +------------- drivers/net/usb/lan78xx.h | 14 +------------- 2 files changed, 2 insertions(+), 26 deletions(-) diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c index 3d505c2..e1c055d 100644 --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c @@ -1,18 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * 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 . */ #include #include diff --git a/drivers/net/usb/lan78xx.h b/drivers/net/usb/lan78xx.h index 25aa546..968e5e5 100644 --- a/drivers/net/usb/lan78xx.h +++ b/drivers/net/usb/lan78xx.h @@ -1,18 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * 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 . */ #ifndef _LAN78XX_H #define _LAN78XX_H From patchwork Tue Sep 4 17:29:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 966029 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 424YkR0KWXz9sCw for ; Wed, 5 Sep 2018 03:30:07 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727793AbeIDVzv (ORCPT ); Tue, 4 Sep 2018 17:55:51 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:59469 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727220AbeIDVzu (ORCPT ); Tue, 4 Sep 2018 17:55:50 -0400 Received: from localhost.localdomain ([37.4.249.97]) by mrelayeu.kundenserver.de (mreue102 [212.227.15.183]) with ESMTPSA (Nemesis) id 0Lb1ib-1fUpDu40mf-00kdbC; Tue, 04 Sep 2018 19:29:40 +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 V2 4/4 next] net: lan78xx: Make declaration style consistent Date: Tue, 4 Sep 2018 19:29:12 +0200 Message-Id: <1536082152-3669-5-git-send-email-stefan.wahren@i2se.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1536082152-3669-1-git-send-email-stefan.wahren@i2se.com> References: <1536082152-3669-1-git-send-email-stefan.wahren@i2se.com> X-Provags-ID: V03:K1:A77hTVESIIEQYxz8Sf1Jj08AlI77pYKhh3dmIqk1O8L7BLNAHV5 aOWXktCunBVGoFOrgBju38c3GO+Ik6JfIHykC6nQ1Xjs1qr9fm18ASvowLTudm7H0xeToQQ Qu8sPwKq1BdakBibr6QjC3rEMNcYvgSPMp0y3wXSS7OsIdaA8hOnoRSlKJr4xx8hB9OkXi6 d5zAxKBFDY0ilx+4Uh5vg== X-UI-Out-Filterresults: notjunk:1; V01:K0:Jm+lOBuXalw=:AeQKnrE5ZxBZZqhZsrjjFT 6Xo+hXUSJeWnuV7b3vzoln8V6cij32/nP5r1FmEviIoJKURBcgHd8aRNGN3BXx0aufAf3mgWU //aczNFu6ogmD88Dsfh29bwKmagZhSsRVME6T9OZNZUATEsie26CwXwxH7COvUBvyUUiUfXJB yY3WHnxrsulNMaJccA2sbzmHlGNsAZGMKprDZU9+CALrJD85wDtiz9yNhgKVtYHMnAUTivT/7 M1XGyPL4brkGwr84zgStz+YSLpC4uMIKyf52eAC+usUcuYVlW+7BQaHuGZc6y4x+Z4A83CoMu kjscUgrThqcy2NBq5Sgb/4m4BZ4M4O1tZTqXH1R4m0jA25zAnLUUWG9pqwqoNtPuvQOM5TyfX 5fjXT55hZc2Y6EE8ovpzmvFlXmKREwB7qag0HlBAx5Sxpd6NFfkUE+IEvD8tXwwFp9a1OwIK2 sbHxJB4zqXGOioqIg7ll5IKMIQvrbyxuZAbaLowi5sRXUd9oMIVJsKLtFuOnfkuSHLpjhaT2c YzJ2u6SOchDBaWCzDMkbJVzCstQxeqJP/KIuMevopHtUVFPa53HiisQOnt6aImXi0lOn77e2o HE3dZNgyZKd11m9O4RNvdJca5SlQ9bXVdKdaycPXLY8nGQf1BB+CsFy3rjLHfft8egDvKBDYy dykMXEkh0rBp3mZRl/hAIA450G0GOjy35GHDbru4YO0AYOfmHoAiaqU8/Q07sKUqkF60= 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 e1c055d..331bc99 100644 --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c @@ -1015,7 +1015,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]; @@ -2690,7 +2690,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); @@ -3073,7 +3073,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); @@ -3633,10 +3633,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);