Commit 4972c6cc authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'via-rhine-Resume-fix-and-other-maintenance-work' 



Kevin Brace says:

====================
via-rhine: Resume fix and other maintenance work

I use via-rhine based Ethernet regularly, and the Ethernet dying
after resume was really annoying me.  I decided to take the
matter into my own hands, and came up with a fix for the Ethernet
disappearing after resume.  I will also want to take over the code
maintenance work for via-rhine.  The patches apply to the latest
code, but they should be backported to older kernels as well.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 6667df91 2b6b78e0

MAINTAINERS

+2 −1
Original line number Diff line number Diff line
@@ -18283,7 +18283,8 @@ F: drivers/gpu/vga/vga_switcheroo.c 
F:	include/linux/vga_switcheroo.h









VIA RHINE NETWORK DRIVER









S:	Orphan









S:	Maintained









M:	Kevin Brace <kevinbrace@bracecomputerlab.com>









F:	drivers/net/ethernet/via/via-rhine.c

















VIA SD/MMC CARD CONTROLLER DRIVER

























drivers/net/ethernet/via/via-rhine.c



+4
−17






























Original line number
Diff line number
Diff line







@@ -2,7 +2,7 @@







/*









	Written 1998-2001 by Donald Becker.



















	Current Maintainer: Roger Luethi <rl@hellgate.ch>









	Current Maintainer: Kevin Brace <kevinbrace@bracecomputerlab.com>



















	This software may be used and distributed according to the terms of









	the GNU General Public License (GPL), incorporated herein by reference.








@@ -32,8 +32,6 @@







#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



















#define DRV_NAME	"via-rhine"









#define DRV_VERSION	"1.5.1"









#define DRV_RELDATE	"2010-10-09"



















#include <linux/types.h>


















@@ -117,10 +115,6 @@ static const int multicast_filter_limit = 32;







#include <linux/uaccess.h>









#include <linux/dmi.h>



















/* These identify the driver base version and may not be removed. */









static const char version[] =









	"v1.10-LK" DRV_VERSION " " DRV_RELDATE " Written by Donald Becker";



















MODULE_AUTHOR("Donald Becker <becker@scyld.com>");









MODULE_DESCRIPTION("VIA Rhine PCI Fast Ethernet driver");









MODULE_LICENSE("GPL");








@@ -243,7 +237,7 @@ enum rhine_revs {







	VT8233		= 0x60,	/* Integrated MAC */









	VT8235		= 0x74,	/* Integrated MAC */









	VT8237		= 0x78,	/* Integrated MAC */









	VTunknown1	= 0x7C,









	VT8251		= 0x7C,	/* Integrated MAC */









	VT6105		= 0x80,









	VT6105_B0	= 0x83,









	VT6105L		= 0x8A,








@@ -1051,11 +1045,6 @@ static int rhine_init_one_pci(struct pci_dev *pdev,







	u32 quirks = 0;









#endif



















/* when built into the kernel, we only print version if device is found */









#ifndef MODULE









	pr_info_once("%s\n", version);









#endif



















	rc = pci_enable_device(pdev);









	if (rc)









		goto err_out;








@@ -1706,6 +1695,8 @@ static int rhine_open(struct net_device *dev)







		goto out_free_ring;



















	alloc_tbufs(dev);









	enable_mmio(rp->pioaddr, rp->quirks);









	rhine_power_init(dev);









	rhine_chip_reset(dev);









	rhine_task_enable(rp);









	init_registers(dev);








@@ -2294,7 +2285,6 @@ static void netdev_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *i







	struct device *hwdev = dev->dev.parent;



















	strlcpy(info->driver, DRV_NAME, sizeof(info->driver));









	strlcpy(info->version, DRV_VERSION, sizeof(info->version));









	strlcpy(info->bus_info, dev_name(hwdev), sizeof(info->bus_info));









}


















@@ -2616,9 +2606,6 @@ static int __init rhine_init(void)







	int ret_pci, ret_platform;



















/* when a module, this is printed whether or not devices are found in probe */









#ifdef MODULE









	pr_info("%s\n", version);









#endif









	if (dmi_check_system(rhine_dmi_table)) {









		/* these BIOSes fail at PXE boot if chip is in D3 */









		avoid_D3 = true;


































































CRA Git | Maintained and supported by SUSTech CRA and CCSE