|
@@ -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 <http://www.gnu.org/licenses/>.
|
|
|
*/
|
|
|
#include <linux/version.h>
|
|
|
#include <linux/module.h>
|
|
@@ -1027,7 +1015,7 @@ done:
|
|
|
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];
|
|
@@ -2702,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);
|
|
@@ -2952,6 +2940,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);
|
|
|
|
|
@@ -3080,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);
|
|
@@ -3640,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);
|
|
@@ -3761,7 +3754,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;
|