Commit a475f603 authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files

drivers/net/usb: Use netif_<level> logging facilities 



Convert from:
	if (netif_msg_<foo>(priv))
		dev_<level>(dev...
to
	netif_<level>(priv, foo, dev...

Also convert a few:

	if (i < REG_TIMEOUT) {
		etc...
		return ret;
       }
to
	if (i >= REG_TIMEOUT)
		goto fail;
	etc...
	return ret;

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 60b86755

drivers/net/usb/cdc_ether.c

+8 −10
Original line number Diff line number Diff line
@@ -339,8 +339,8 @@ EXPORT_SYMBOL_GPL(usbnet_cdc_unbind); 


static void dumpspeed(struct usbnet *dev, __le32 *speeds)

{

	if (netif_msg_timer(dev))

		netdev_info(dev->net, "link speeds: %u kbps up, %u kbps down\n",

	netif_info(dev, timer, dev->net,

		   "link speeds: %u kbps up, %u kbps down\n",

		   __le32_to_cpu(speeds[0]) / 1000,

		   __le32_to_cpu(speeds[1]) / 1000);

}
@@ -361,8 +361,7 @@ static void cdc_status(struct usbnet *dev, struct urb *urb) 
	event = urb->transfer_buffer;

	switch (event->bNotificationType) {

	case USB_CDC_NOTIFY_NETWORK_CONNECTION:

		if (netif_msg_timer(dev))

			netdev_dbg(dev->net, "CDC: carrier %s\n",

		netif_dbg(dev, timer, dev->net, "CDC: carrier %s\n",

			  event->wValue ? "on" : "off");

		if (event->wValue)

			netif_carrier_on(dev->net);
@@ -370,8 +369,7 @@ static void cdc_status(struct usbnet *dev, struct urb *urb) 
			netif_carrier_off(dev->net);

		break;

	case USB_CDC_NOTIFY_SPEED_CHANGE:	/* tx/rx rates */

		if (netif_msg_timer(dev))

			netdev_dbg(dev->net, "CDC: speed change (len %d)\n",

		netif_dbg(dev, timer, dev->net, "CDC: speed change (len %d)\n",

			  urb->actual_length);

		if (urb->actual_length != (sizeof *event + 8))

			set_bit(EVENT_STS_SPLIT, &dev->flags);

drivers/net/usb/net1080.c

+45 −51
Original line number Diff line number Diff line
@@ -203,11 +203,8 @@ static void nc_dump_registers(struct usbnet *dev) 


static inline void nc_dump_usbctl(struct usbnet *dev, u16 usbctl)

{

	if (!netif_msg_link(dev))

		return;

	netdev_dbg(dev->net, "net1080 %s-%s usbctl 0x%x:%s%s%s%s%s;"

		   " this%s%s;"

		   " other%s%s; r/o 0x%x\n",

	netif_dbg(dev, link, dev->net,

		  "net1080 %s-%s usbctl 0x%x:%s%s%s%s%s; this%s%s; other%s%s; r/o 0x%x\n",

		  dev->udev->bus->bus_name, dev->udev->devpath,

		  usbctl,

		  (usbctl & USBCTL_ENABLE_LANG) ? " lang" : "",
@@ -249,9 +246,8 @@ static inline void nc_dump_usbctl(struct usbnet *dev, u16 usbctl) 


static inline void nc_dump_status(struct usbnet *dev, u16 status)

{

	if (!netif_msg_link(dev))

		return;

	netdev_dbg(dev->net, "net1080 %s-%s status 0x%x: this (%c) PKT=%d%s%s%s; other PKT=%d%s%s%s; unspec 0x%x\n",

	netif_dbg(dev, link, dev->net,

		  "net1080 %s-%s status 0x%x: this (%c) PKT=%d%s%s%s; other PKT=%d%s%s%s; unspec 0x%x\n",

		  dev->udev->bus->bus_name, dev->udev->devpath,

		  status,
@@ -284,8 +280,7 @@ static inline void nc_dump_status(struct usbnet *dev, u16 status) 


static inline void nc_dump_ttl(struct usbnet *dev, u16 ttl)

{

	if (netif_msg_link(dev))

		netdev_dbg(dev->net, "net1080 %s-%s ttl 0x%x this = %d, other = %d\n",

	netif_dbg(dev, link, dev->net, "net1080 %s-%s ttl 0x%x this = %d, other = %d\n",

		  dev->udev->bus->bus_name, dev->udev->devpath,

		  ttl, TTL_THIS(ttl), TTL_OTHER(ttl));

}
@@ -332,8 +327,7 @@ static int net1080_reset(struct usbnet *dev) 
			MK_TTL(NC_READ_TTL_MS, TTL_OTHER(ttl)) );

	dbg("%s: assigned TTL, %d ms", dev->net->name, NC_READ_TTL_MS);



	if (netif_msg_link(dev))

		netdev_info(dev->net, "port %c, peer %sconnected\n",

	netif_info(dev, link, dev->net, "port %c, peer %sconnected\n",

		   (status & STATUS_PORT_A) ? 'A' : 'B',

		   (status & STATUS_CONN_OTHER) ? "" : "dis");

	retval = 0;
@@ -412,8 +406,8 @@ static void nc_ensure_sync(struct usbnet *dev) 
			return;

		}



		if (netif_msg_rx_err(dev))

			netdev_dbg(dev->net, "flush net1080; too many framing errors\n");

		netif_dbg(dev, rx_err, dev->net,

			  "flush net1080; too many framing errors\n");

		dev->frame_errors = 0;

	}

}

drivers/net/usb/pegasus.c

+74 −96
Original line number Diff line number Diff line
@@ -132,9 +132,10 @@ static void ctrl_callback(struct urb *urb) 
	case -ENOENT:

		break;

	default:

		if (netif_msg_drv(pegasus) && printk_ratelimit())

			dev_dbg(&pegasus->intf->dev, "%s, status %d\n",

				__func__, status);

		if (net_ratelimit())

			netif_dbg(pegasus, drv, pegasus->net,

				  "%s, status %d\n", __func__, status);

		break;

	}

	pegasus->flags &= ~ETH_REGS_CHANGED;

	wake_up(&pegasus->ctrl_wait);
@@ -149,9 +150,8 @@ static int get_registers(pegasus_t * pegasus, __u16 indx, __u16 size, 


	buffer = kmalloc(size, GFP_KERNEL);

	if (!buffer) {

		if (netif_msg_drv(pegasus))

			dev_warn(&pegasus->intf->dev, "out of memory in %s\n",

					__func__);

		netif_warn(pegasus, drv, pegasus->net,

			   "out of memory in %s\n", __func__);

		return -ENOMEM;

	}

	add_wait_queue(&pegasus->ctrl_wait, &wait);
@@ -181,9 +181,9 @@ static int get_registers(pegasus_t * pegasus, __u16 indx, __u16 size, 
		set_current_state(TASK_RUNNING);

		if (ret == -ENODEV)

			netif_device_detach(pegasus->net);

		if (netif_msg_drv(pegasus) && printk_ratelimit())

			dev_err(&pegasus->intf->dev, "%s, status %d\n",

					__func__, ret);

		if (net_ratelimit())

			netif_err(pegasus, drv, pegasus->net,

				  "%s, status %d\n", __func__, ret);

		goto out;

	}
@@ -205,9 +205,8 @@ static int set_registers(pegasus_t * pegasus, __u16 indx, __u16 size, 


	buffer = kmalloc(size, GFP_KERNEL);

	if (!buffer) {

		if (netif_msg_drv(pegasus))

			dev_warn(&pegasus->intf->dev, "out of memory in %s\n",

					__func__);

		netif_warn(pegasus, drv, pegasus->net,

			   "out of memory in %s\n", __func__);

		return -ENOMEM;

	}

	memcpy(buffer, data, size);
@@ -237,9 +236,8 @@ static int set_registers(pegasus_t * pegasus, __u16 indx, __u16 size, 
	if ((ret = usb_submit_urb(pegasus->ctrl_urb, GFP_ATOMIC))) {

		if (ret == -ENODEV)

			netif_device_detach(pegasus->net);

		if (netif_msg_drv(pegasus))

			dev_err(&pegasus->intf->dev, "%s, status %d\n",

					__func__, ret);

		netif_err(pegasus, drv, pegasus->net,

			  "%s, status %d\n", __func__, ret);

		goto out;

	}
@@ -259,9 +257,8 @@ static int set_register(pegasus_t * pegasus, __u16 indx, __u8 data) 


	tmp = kmalloc(1, GFP_KERNEL);

	if (!tmp) {

		if (netif_msg_drv(pegasus))

			dev_warn(&pegasus->intf->dev, "out of memory in %s\n",

					__func__);

		netif_warn(pegasus, drv, pegasus->net,

			   "out of memory in %s\n", __func__);

		return -ENOMEM;

	}

	memcpy(tmp, &data, 1);
@@ -290,9 +287,9 @@ static int set_register(pegasus_t * pegasus, __u16 indx, __u8 data) 
	if ((ret = usb_submit_urb(pegasus->ctrl_urb, GFP_ATOMIC))) {

		if (ret == -ENODEV)

			netif_device_detach(pegasus->net);

		if (netif_msg_drv(pegasus) && printk_ratelimit())

			dev_err(&pegasus->intf->dev, "%s, status %d\n",

					__func__, ret);

		if (net_ratelimit())

			netif_err(pegasus, drv, pegasus->net,

				  "%s, status %d\n", __func__, ret);

		goto out;

	}
@@ -323,9 +320,8 @@ static int update_eth_regs_async(pegasus_t * pegasus) 
	if ((ret = usb_submit_urb(pegasus->ctrl_urb, GFP_ATOMIC))) {

		if (ret == -ENODEV)

			netif_device_detach(pegasus->net);

		if (netif_msg_drv(pegasus))

			dev_err(&pegasus->intf->dev, "%s, status %d\n",

					__func__, ret);

		netif_err(pegasus, drv, pegasus->net,

			  "%s, status %d\n", __func__, ret);

	}



	return ret;
@@ -349,14 +345,16 @@ static int read_mii_word(pegasus_t * pegasus, __u8 phy, __u8 indx, __u16 * regd) 
		if (data[0] & PHY_DONE)

			break;

	}

	if (i < REG_TIMEOUT) {



	if (i >= REG_TIMEOUT)

		goto fail;



	ret = get_registers(pegasus, PhyData, 2, &regdi);

	*regd = le16_to_cpu(regdi);

	return ret;

	}



fail:

	if (netif_msg_drv(pegasus))

		dev_warn(&pegasus->intf->dev, "%s failed\n", __func__);

	netif_warn(pegasus, drv, pegasus->net, "%s failed\n", __func__);



	return ret;

}
@@ -388,12 +386,14 @@ static int write_mii_word(pegasus_t * pegasus, __u8 phy, __u8 indx, __u16 regd) 
		if (data[0] & PHY_DONE)

			break;

	}

	if (i < REG_TIMEOUT)



	if (i >= REG_TIMEOUT)

		goto fail;



	return ret;



fail:

	if (netif_msg_drv(pegasus))

		dev_warn(&pegasus->intf->dev, "%s failed\n", __func__);

	netif_warn(pegasus, drv, pegasus->net, "%s failed\n", __func__);

	return -ETIMEDOUT;

}
@@ -422,15 +422,15 @@ static int read_eprom_word(pegasus_t * pegasus, __u8 index, __u16 * retdata) 
		if (ret == -ESHUTDOWN)

			goto fail;

	}

	if (i < REG_TIMEOUT) {

	if (i >= REG_TIMEOUT)

		goto fail;



	ret = get_registers(pegasus, EpromData, 2, &retdatai);

	*retdata = le16_to_cpu(retdatai);

	return ret;

	}



fail:

	if (netif_msg_drv(pegasus))

		dev_warn(&pegasus->intf->dev, "%s failed\n", __func__);

	netif_warn(pegasus, drv, pegasus->net, "%s failed\n", __func__);

	return -ETIMEDOUT;

}
@@ -475,11 +475,13 @@ static int write_eprom_word(pegasus_t * pegasus, __u8 index, __u16 data) 
			break;

	}

	disable_eprom_write(pegasus);

	if (i < REG_TIMEOUT)

	if (i >= REG_TIMEOUT)

		goto fail;



	return ret;



fail:

	if (netif_msg_drv(pegasus))

		dev_warn(&pegasus->intf->dev, "%s failed\n", __func__);

	netif_warn(pegasus, drv, pegasus->net, "%s failed\n", __func__);

	return -ETIMEDOUT;

}

#endif				/* PEGASUS_WRITE_EEPROM */
@@ -642,25 +644,20 @@ static void read_bulk_callback(struct urb *urb) 
	case 0:

		break;

	case -ETIME:

		if (netif_msg_rx_err(pegasus))

			pr_debug("%s: reset MAC\n", net->name);

		netif_dbg(pegasus, rx_err, net, "reset MAC\n");

		pegasus->flags &= ~PEGASUS_RX_BUSY;

		break;

	case -EPIPE:		/* stall, or disconnect from TT */

		/* FIXME schedule work to clear the halt */

		if (netif_msg_rx_err(pegasus))

			printk(KERN_WARNING "%s: no rx stall recovery\n",

					net->name);

		netif_warn(pegasus, rx_err, net, "no rx stall recovery\n");

		return;

	case -ENOENT:

	case -ECONNRESET:

	case -ESHUTDOWN:

		if (netif_msg_ifdown(pegasus))

			pr_debug("%s: rx unlink, %d\n", net->name, status);

		netif_dbg(pegasus, ifdown, net, "rx unlink, %d\n", status);

		return;

	default:

		if (netif_msg_rx_err(pegasus))

			pr_debug("%s: RX status %d\n", net->name, status);

		netif_dbg(pegasus, rx_err, net, "RX status %d\n", status);

		goto goon;

	}
@@ -669,9 +666,8 @@ static void read_bulk_callback(struct urb *urb) 


	rx_status = buf[count - 2];

	if (rx_status & 0x1e) {

		if (netif_msg_rx_err(pegasus))

			pr_debug("%s: RX packet error %x\n",

					net->name, rx_status);

		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++;
@@ -758,9 +754,7 @@ static void rx_fixup(unsigned long data) 
		pegasus->rx_skb = pull_skb(pegasus);

	}

	if (pegasus->rx_skb == NULL) {

		if (netif_msg_rx_err(pegasus))

			printk(KERN_WARNING "%s: low on memory\n",

					pegasus->net->name);

		netif_warn(pegasus, rx_err, pegasus->net, "low on memory\n");

		tasklet_schedule(&pegasus->rx_tl);

		goto done;

	}
@@ -800,19 +794,15 @@ static void write_bulk_callback(struct urb *urb) 
	case -EPIPE:

		/* FIXME schedule_work() to clear the tx halt */

		netif_stop_queue(net);

		if (netif_msg_tx_err(pegasus))

			printk(KERN_WARNING "%s: no tx stall recovery\n",

					net->name);

		netif_warn(pegasus, tx_err, net, "no tx stall recovery\n");

		return;

	case -ENOENT:

	case -ECONNRESET:

	case -ESHUTDOWN:

		if (netif_msg_ifdown(pegasus))

			pr_debug("%s: tx unlink, %d\n", net->name, status);

		netif_dbg(pegasus, ifdown, net, "tx unlink, %d\n", status);

		return;

	default:

		if (netif_msg_tx_err(pegasus))

			pr_info("%s: TX status %d\n", net->name, status);

		netif_info(pegasus, tx_err, net, "TX status %d\n", status);

		/* FALL THROUGH */

	case 0:

		break;
@@ -843,9 +833,7 @@ static void intr_callback(struct urb *urb) 
		/* some Pegasus-I products report LOTS of data

		 * toggle errors... avoid log spamming

		 */

		if (netif_msg_timer(pegasus))

			pr_debug("%s: intr status %d\n", net->name,

					status);

		netif_dbg(pegasus, timer, net, "intr status %d\n", status);

	}



	if (urb->actual_length >= 6) {
@@ -875,16 +863,15 @@ static void intr_callback(struct urb *urb) 
	res = usb_submit_urb(urb, GFP_ATOMIC);

	if (res == -ENODEV)

		netif_device_detach(pegasus->net);

	if (res && netif_msg_timer(pegasus))

		printk(KERN_ERR "%s: can't resubmit interrupt urb, %d\n",

				net->name, res);

	if (res)

		netif_err(pegasus, timer, net,

			  "can't resubmit interrupt urb, %d\n", res);

}



static void pegasus_tx_timeout(struct net_device *net)

{

	pegasus_t *pegasus = netdev_priv(net);

	if (netif_msg_timer(pegasus))

		printk(KERN_WARNING "%s: tx timeout\n", net->name);

	netif_warn(pegasus, timer, net, "tx timeout\n");

	usb_unlink_urb(pegasus->tx_urb);

	pegasus->stats.tx_errors++;

}
@@ -906,9 +893,7 @@ static netdev_tx_t pegasus_start_xmit(struct sk_buff *skb, 
			  pegasus->tx_buff, count,

			  write_bulk_callback, pegasus);

	if ((res = usb_submit_urb(pegasus->tx_urb, GFP_ATOMIC))) {

		if (netif_msg_tx_err(pegasus))

			printk(KERN_WARNING "%s: fail tx, %d\n",

					net->name, res);

		netif_warn(pegasus, tx_err, net, "fail tx, %d\n", res);

		switch (res) {

		case -EPIPE:		/* stall, or disconnect from TT */

			/* cleanup should already have been scheduled */
@@ -952,9 +937,8 @@ static inline void get_interrupt_interval(pegasus_t * pegasus) 
	interval = data >> 8;

	if (pegasus->usb->speed != USB_SPEED_HIGH) {

		if (interval < 0x80) {

			if (netif_msg_timer(pegasus))

				dev_info(&pegasus->intf->dev, "intr interval "

					"changed from %ums to %ums\n",

			netif_info(pegasus, timer, pegasus->net,

				   "intr interval changed from %ums to %ums\n",

				   interval, 0x80);

			interval = 0x80;

			data = (data & 0x00FF) | ((u16)interval << 8);
@@ -1046,8 +1030,7 @@ static int pegasus_open(struct net_device *net) 
	if ((res = usb_submit_urb(pegasus->rx_urb, GFP_KERNEL))) {

		if (res == -ENODEV)

			netif_device_detach(pegasus->net);

		if (netif_msg_ifup(pegasus))

			pr_debug("%s: failed rx_urb, %d", net->name, res);

		netif_dbg(pegasus, ifup, net, "failed rx_urb, %d\n", res);

		goto exit;

	}
@@ -1058,15 +1041,13 @@ static int pegasus_open(struct net_device *net) 
	if ((res = usb_submit_urb(pegasus->intr_urb, GFP_KERNEL))) {

		if (res == -ENODEV)

			netif_device_detach(pegasus->net);

		if (netif_msg_ifup(pegasus))

			pr_debug("%s: failed intr_urb, %d\n", net->name, res);

		netif_dbg(pegasus, ifup, net, "failed intr_urb, %d\n", res);

		usb_kill_urb(pegasus->rx_urb);

		goto exit;

	}

	if ((res = enable_net_traffic(net, pegasus->usb))) {

		if (netif_msg_ifup(pegasus))

			pr_debug("%s: can't enable_net_traffic() - %d\n",

					net->name, res);

		netif_dbg(pegasus, ifup, net,

			  "can't enable_net_traffic() - %d\n", res);

		res = -EIO;

		usb_kill_urb(pegasus->rx_urb);

		usb_kill_urb(pegasus->intr_urb);
@@ -1075,8 +1056,7 @@ static int pegasus_open(struct net_device *net) 
	}

	set_carrier(net);

	netif_start_queue(net);

	if (netif_msg_ifup(pegasus))

		pr_debug("%s: open\n", net->name);

	netif_dbg(pegasus, ifup, net, "open\n");

	res = 0;

exit:

	return res;
@@ -1230,13 +1210,11 @@ static void pegasus_set_multicast(struct net_device *net) 


	if (net->flags & IFF_PROMISC) {

		pegasus->eth_regs[EthCtrl2] |= RX_PROMISCUOUS;

		if (netif_msg_link(pegasus))

			pr_info("%s: Promiscuous mode enabled.\n", net->name);

		netif_info(pegasus, link, net, "Promiscuous mode enabled\n");

	} else if (!netdev_mc_empty(net) || (net->flags & IFF_ALLMULTI)) {

		pegasus->eth_regs[EthCtrl0] |= RX_MULTICAST;

		pegasus->eth_regs[EthCtrl2] &= ~RX_PROMISCUOUS;

		if (netif_msg_link(pegasus))

			pr_debug("%s: set allmulti\n", net->name);

		netif_dbg(pegasus, link, net, "set allmulti\n");

	} else {

		pegasus->eth_regs[EthCtrl0] &= ~RX_MULTICAST;

		pegasus->eth_regs[EthCtrl2] &= ~RX_PROMISCUOUS;

drivers/net/usb/rndis_host.c

+6 −8
Original line number Diff line number Diff line
@@ -335,8 +335,8 @@ generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf, int flags) 


	dev->maxpacket = usb_maxpacket(dev->udev, dev->out, 1);

	if (dev->maxpacket == 0) {

		if (netif_msg_probe(dev))

			dev_dbg(&intf->dev, "dev->maxpacket can't be 0\n");

		netif_dbg(dev, probe, dev->net,

			  "dev->maxpacket can't be 0\n");

		retval = -EINVAL;

		goto fail_and_release;

	}
@@ -394,17 +394,15 @@ generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf, int flags) 
	}

	if ((flags & FLAG_RNDIS_PHYM_WIRELESS) &&

			*phym != RNDIS_PHYSICAL_MEDIUM_WIRELESS_LAN) {

		if (netif_msg_probe(dev))

			dev_dbg(&intf->dev, "driver requires wireless "

				"physical medium, but device is not.\n");

		netif_dbg(dev, probe, dev->net,

			  "driver requires wireless physical medium, but device is not\n");

		retval = -ENODEV;

		goto halt_fail_and_release;

	}

	if ((flags & FLAG_RNDIS_PHYM_NOT_WIRELESS) &&

			*phym == RNDIS_PHYSICAL_MEDIUM_WIRELESS_LAN) {

		if (netif_msg_probe(dev))

			dev_dbg(&intf->dev, "driver requires non-wireless "

				"physical medium, but device is wireless.\n");

		netif_dbg(dev, probe, dev->net,

			  "driver requires non-wireless physical medium, but device is wireless.\n");

		retval = -ENODEV;

		goto halt_fail_and_release;

	}

drivers/net/usb/smsc95xx.c

+40 −59
Original line number Diff line number Diff line
@@ -376,13 +376,11 @@ static void smsc95xx_set_multicast(struct net_device *netdev) 
	spin_lock_irqsave(&pdata->mac_cr_lock, flags);



	if (dev->net->flags & IFF_PROMISC) {

		if (netif_msg_drv(dev))

			netdev_dbg(dev->net, "promiscuous mode enabled\n");

		netif_dbg(dev, drv, dev->net, "promiscuous mode enabled\n");

		pdata->mac_cr |= MAC_CR_PRMS_;

		pdata->mac_cr &= ~(MAC_CR_MCPAS_ | MAC_CR_HPFILT_);

	} else if (dev->net->flags & IFF_ALLMULTI) {

		if (netif_msg_drv(dev))

			netdev_dbg(dev->net, "receive all multicast enabled\n");

		netif_dbg(dev, drv, dev->net, "receive all multicast enabled\n");

		pdata->mac_cr |= MAC_CR_MCPAS_;

		pdata->mac_cr &= ~(MAC_CR_PRMS_ | MAC_CR_HPFILT_);

	} else if (!netdev_mc_empty(dev->net)) {
@@ -410,12 +408,10 @@ static void smsc95xx_set_multicast(struct net_device *netdev) 
		if (count != ((u32) netdev_mc_count(dev->net)))

			netdev_warn(dev->net, "mc_count != dev->mc_count\n");



		if (netif_msg_drv(dev))

			netdev_dbg(dev->net, "HASHH=0x%08X, HASHL=0x%08X\n",

		netif_dbg(dev, drv, dev->net, "HASHH=0x%08X, HASHL=0x%08X\n",

				   hash_hi, hash_lo);

	} else {

		if (netif_msg_drv(dev))

			netdev_dbg(dev->net, "receive own packets only\n");

		netif_dbg(dev, drv, dev->net, "receive own packets only\n");

		pdata->mac_cr &=

			~(MAC_CR_PRMS_ | MAC_CR_MCPAS_ | MAC_CR_HPFILT_);

	}
@@ -452,13 +448,11 @@ static void smsc95xx_phy_update_flowcontrol(struct usbnet *dev, u8 duplex, 
		else

			afc_cfg &= ~0xF;



		if (netif_msg_link(dev))

			netdev_dbg(dev->net, "rx pause %s, tx pause %s\n",

		netif_dbg(dev, link, dev->net, "rx pause %s, tx pause %s\n",

				   cap & FLOW_CTRL_RX ? "enabled" : "disabled",

				   cap & FLOW_CTRL_TX ? "enabled" : "disabled");

	} else {

		if (netif_msg_link(dev))

			netdev_dbg(dev->net, "half duplex\n");

		netif_dbg(dev, link, dev->net, "half duplex\n");

		flow = 0;

		afc_cfg |= 0xF;

	}
@@ -486,8 +480,7 @@ static int smsc95xx_link_reset(struct usbnet *dev) 
	lcladv = smsc95xx_mdio_read(dev->net, mii->phy_id, MII_ADVERTISE);

	rmtadv = smsc95xx_mdio_read(dev->net, mii->phy_id, MII_LPA);



	if (netif_msg_link(dev))

		netdev_dbg(dev->net, "speed: %d duplex: %d lcladv: %04x rmtadv: %04x\n",

	netif_dbg(dev, link, dev->net, "speed: %d duplex: %d lcladv: %04x rmtadv: %04x\n",

		  ecmd.speed, ecmd.duplex, lcladv, rmtadv);



	spin_lock_irqsave(&pdata->mac_cr_lock, flags);
@@ -520,8 +513,7 @@ static void smsc95xx_status(struct usbnet *dev, struct urb *urb) 
	memcpy(&intdata, urb->transfer_buffer, 4);

	le32_to_cpus(&intdata);



	if (netif_msg_link(dev))

		netdev_dbg(dev->net, "intdata: 0x%08X\n", intdata);

	netif_dbg(dev, link, dev->net, "intdata: 0x%08X\n", intdata);



	if (intdata & INT_ENP_PHY_INT_)

		usbnet_defer_kevent(dev, EVENT_LINK_RESET);
@@ -557,8 +549,7 @@ static int smsc95xx_set_csums(struct usbnet *dev) 
		return ret;

	}



	if (netif_msg_hw(dev))

		netdev_dbg(dev->net, "COE_CR = 0x%08x\n", read_buf);

	netif_dbg(dev, hw, dev->net, "COE_CR = 0x%08x\n", read_buf);

	return 0;

}
@@ -662,16 +653,14 @@ static void smsc95xx_init_mac_address(struct usbnet *dev) 
			dev->net->dev_addr) == 0) {

		if (is_valid_ether_addr(dev->net->dev_addr)) {

			/* eeprom values are valid so use them */

			if (netif_msg_ifup(dev))

				netdev_dbg(dev->net, "MAC address read from EEPROM\n");

			netif_dbg(dev, ifup, dev->net, "MAC address read from EEPROM\n");

			return;

		}

	}



	/* no eeprom, or eeprom values are invalid. generate random MAC */

	random_ether_addr(dev->net->dev_addr);

	if (netif_msg_ifup(dev))

		netdev_dbg(dev->net, "MAC address set to random_ether_addr\n");

	netif_dbg(dev, ifup, dev->net, "MAC address set to random_ether_addr\n");

}



static int smsc95xx_set_mac_address(struct usbnet *dev)
@@ -750,8 +739,7 @@ static int smsc95xx_phy_initialize(struct usbnet *dev) 
		PHY_INT_MASK_DEFAULT_);

	mii_nway_restart(&dev->mii);



	if (netif_msg_ifup(dev))

		netdev_dbg(dev->net, "phy initialised successfully\n");

	netif_dbg(dev, ifup, dev->net, "phy initialised successfully\n");

	return 0;

}
@@ -762,8 +750,7 @@ static int smsc95xx_reset(struct usbnet *dev) 
	u32 read_buf, write_buf, burst_cap;

	int ret = 0, timeout;



	if (netif_msg_ifup(dev))

		netdev_dbg(dev->net, "entering smsc95xx_reset\n");

	netif_dbg(dev, ifup, dev->net, "entering smsc95xx_reset\n");



	write_buf = HW_CFG_LRST_;

	ret = smsc95xx_write_reg(dev, HW_CFG, write_buf);
@@ -818,8 +805,8 @@ static int smsc95xx_reset(struct usbnet *dev) 
	if (ret < 0)

		return ret;



	if (netif_msg_ifup(dev))

		netdev_dbg(dev->net, "MAC Address: %pM\n", dev->net->dev_addr);

	netif_dbg(dev, ifup, dev->net,

		  "MAC Address: %pM\n", dev->net->dev_addr);



	ret = smsc95xx_read_reg(dev, HW_CFG, &read_buf);

	if (ret < 0) {
@@ -827,8 +814,8 @@ static int smsc95xx_reset(struct usbnet *dev) 
		return ret;

	}



	if (netif_msg_ifup(dev))

		netdev_dbg(dev->net, "Read Value from HW_CFG : 0x%08x\n", read_buf);

	netif_dbg(dev, ifup, dev->net,

		  "Read Value from HW_CFG : 0x%08x\n", read_buf);



	read_buf |= HW_CFG_BIR_;
@@ -844,8 +831,8 @@ static int smsc95xx_reset(struct usbnet *dev) 
		netdev_warn(dev->net, "Failed to read HW_CFG: %d\n", ret);

		return ret;

	}

	if (netif_msg_ifup(dev))

		netdev_dbg(dev->net, "Read Value from HW_CFG after writing HW_CFG_BIR_: 0x%08x\n",

	netif_dbg(dev, ifup, dev->net,

		  "Read Value from HW_CFG after writing HW_CFG_BIR_: 0x%08x\n",

		  read_buf);



	if (!turbo_mode) {
@@ -859,8 +846,8 @@ static int smsc95xx_reset(struct usbnet *dev) 
		dev->rx_urb_size = DEFAULT_FS_BURST_CAP_SIZE;

	}



	if (netif_msg_ifup(dev))

		netdev_dbg(dev->net, "rx_urb_size=%ld\n", (ulong)dev->rx_urb_size);

	netif_dbg(dev, ifup, dev->net,

		  "rx_urb_size=%ld\n", (ulong)dev->rx_urb_size);



	ret = smsc95xx_write_reg(dev, BURST_CAP, burst_cap);

	if (ret < 0) {
@@ -873,8 +860,8 @@ static int smsc95xx_reset(struct usbnet *dev) 
		netdev_warn(dev->net, "Failed to read BURST_CAP: %d\n", ret);

		return ret;

	}

	if (netif_msg_ifup(dev))

		netdev_dbg(dev->net, "Read Value from BURST_CAP after writing: 0x%08x\n",

	netif_dbg(dev, ifup, dev->net,

		  "Read Value from BURST_CAP after writing: 0x%08x\n",

		  read_buf);



	read_buf = DEFAULT_BULK_IN_DELAY;
@@ -889,8 +876,8 @@ static int smsc95xx_reset(struct usbnet *dev) 
		netdev_warn(dev->net, "Failed to read BULK_IN_DLY: %d\n", ret);

		return ret;

	}

	if (netif_msg_ifup(dev))

		netdev_dbg(dev->net, "Read Value from BULK_IN_DLY after writing: 0x%08x\n",

	netif_dbg(dev, ifup, dev->net,

		  "Read Value from BULK_IN_DLY after writing: 0x%08x\n",

		  read_buf);



	ret = smsc95xx_read_reg(dev, HW_CFG, &read_buf);
@@ -898,8 +885,8 @@ static int smsc95xx_reset(struct usbnet *dev) 
		netdev_warn(dev->net, "Failed to read HW_CFG: %d\n", ret);

		return ret;

	}

	if (netif_msg_ifup(dev))

		netdev_dbg(dev->net, "Read Value from HW_CFG: 0x%08x\n", read_buf);

	netif_dbg(dev, ifup, dev->net,

		  "Read Value from HW_CFG: 0x%08x\n", read_buf);



	if (turbo_mode)

		read_buf |= (HW_CFG_MEF_ | HW_CFG_BCE_);
@@ -921,9 +908,8 @@ static int smsc95xx_reset(struct usbnet *dev) 
		netdev_warn(dev->net, "Failed to read HW_CFG: %d\n", ret);

		return ret;

	}

	if (netif_msg_ifup(dev))

		netdev_dbg(dev->net, "Read Value from HW_CFG after writing: 0x%08x\n",

			   read_buf);

	netif_dbg(dev, ifup, dev->net,

		  "Read Value from HW_CFG after writing: 0x%08x\n", read_buf);



	write_buf = 0xFFFFFFFF;

	ret = smsc95xx_write_reg(dev, INT_STS, write_buf);
@@ -938,8 +924,7 @@ static int smsc95xx_reset(struct usbnet *dev) 
		netdev_warn(dev->net, "Failed to read ID_REV: %d\n", ret);

		return ret;

	}

	if (netif_msg_ifup(dev))

		netdev_dbg(dev->net, "ID_REV = 0x%08x\n", read_buf);

	netif_dbg(dev, ifup, dev->net, "ID_REV = 0x%08x\n", read_buf);



	/* Configure GPIO pins as LED outputs */

	write_buf = LED_GPIO_CFG_SPD_LED | LED_GPIO_CFG_LNK_LED |
@@ -1013,8 +998,7 @@ static int smsc95xx_reset(struct usbnet *dev) 
	smsc95xx_start_tx_path(dev);

	smsc95xx_start_rx_path(dev);



	if (netif_msg_ifup(dev))

		netdev_dbg(dev->net, "smsc95xx_reset, return 0\n");

	netif_dbg(dev, ifup, dev->net, "smsc95xx_reset, return 0\n");

	return 0;

}
@@ -1071,8 +1055,7 @@ static void smsc95xx_unbind(struct usbnet *dev, struct usb_interface *intf) 
{

	struct smsc95xx_priv *pdata = (struct smsc95xx_priv *)(dev->data[0]);

	if (pdata) {

		if (netif_msg_ifdown(dev))

			netdev_dbg(dev->net, "free pdata\n");

		netif_dbg(dev, ifdown, dev->net, "free pdata\n");

		kfree(pdata);

		pdata = NULL;

		dev->data[0] = 0;
@@ -1106,9 +1089,8 @@ static int smsc95xx_rx_fixup(struct usbnet *dev, struct sk_buff *skb) 
		align_count = (4 - ((size + NET_IP_ALIGN) % 4)) % 4;



		if (unlikely(header & RX_STS_ES_)) {

			if (netif_msg_rx_err(dev))

				netdev_dbg(dev->net, "Error header=0x%08x\n",

					   header);

			netif_dbg(dev, rx_err, dev->net,

				  "Error header=0x%08x\n", header);

			dev->net->stats.rx_errors++;

			dev->net->stats.rx_dropped++;
@@ -1125,9 +1107,8 @@ static int smsc95xx_rx_fixup(struct usbnet *dev, struct sk_buff *skb) 
		} else {

			/* ETH_FRAME_LEN + 4(CRC) + 2(COE) + 4(Vlan) */

			if (unlikely(size > (ETH_FRAME_LEN + 12))) {

				if (netif_msg_rx_err(dev))

					netdev_dbg(dev->net, "size err header=0x%08x\n",

						   header);

				netif_dbg(dev, rx_err, dev->net,

					  "size err header=0x%08x\n", header);

				return 0;

			}

CRA Git | Maintained and supported by SUSTech CRA and CCSE