Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d72ec9e2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
  spidernet MAINTAINERship update
  sky2: remove check for PCI wakeup setting from BIOS
  sky2: large memory workaround.
  fs_enet: check for phydev existence in the ethtool handlers
  [usb netdev] asix: fix regression
  r8169: fix missing loop variable increment
  ip1000: menu location change
  Fixed a small typo in the loopback driver
  3c509: PnP resource management fix
  netxen: fix byte-swapping in tx and rx
  netxen: optimize tx handling
  netxen: stop second phy correctly
  netxen: update driver version
  netxen: update MAINTAINERS
  endianness noise in tulip_core
  de4x5 fixes
  xircom_cb endianness fixes
  rt2x00: Put 802.11 data on 4 byte boundary
  rt2x00: Corectly initialize rt2500usb MAC
  rt2x00: Allow rt61 to catch up after a missing tx report
parents fd4be699 cb8da8a3

MAINTAINERS

+6 −4
Original line number Diff line number Diff line
@@ -2739,8 +2739,8 @@ T: git kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6.git 
S:	Maintained



NETXEN (1/10) GbE SUPPORT

P:	Amit S. Kale

M:	amitkale@netxen.com

P:	Dhananjay Phadke

M:	dhananjay@netxen.com

L:	netdev@vger.kernel.org

W:	http://www.netxen.com

S:	Supported
@@ -3611,8 +3611,10 @@ L: linux-kernel@vger.kernel.org ? 
S:	Supported



SPIDERNET NETWORK DRIVER for CELL

P:	Linas Vepstas

M:	linas@austin.ibm.com

P:	Ishizaki Kou

M:	kou.ishizaki@toshiba.co.jp

P:	Jens Osterkamp

M:	jens@de.ibm.com

L:	netdev@vger.kernel.org

S:	Supported

drivers/net/3c509.c

+4 −0
Original line number Diff line number Diff line
@@ -385,6 +385,7 @@ static int __init el3_probe(int card_idx) 
#if defined(__ISAPNP__)

	static int pnp_cards;

	struct pnp_dev *idev = NULL;

	int pnp_found = 0;



	if (nopnp == 1)

		goto no_pnp;
@@ -430,6 +431,7 @@ static int __init el3_probe(int card_idx) 
			pnp_cards++;



			netdev_boot_setup_check(dev);

			pnp_found = 1;

			goto found;

		}

	}
@@ -560,6 +562,8 @@ static int __init el3_probe(int card_idx) 
	lp = netdev_priv(dev);

#if defined(__ISAPNP__)

	lp->dev = &idev->dev;

	if (pnp_found)

		lp->type = EL3_PNP;

#endif

	err = el3_common_init(dev);

drivers/net/Kconfig

+10 −10
Original line number Diff line number Diff line
@@ -166,16 +166,6 @@ config NET_SB1000 


	  If you don't have this card, of course say N.



config IP1000

	tristate "IP1000 Gigabit Ethernet support"

	depends on PCI && EXPERIMENTAL

	select MII

	---help---

	  This driver supports IP1000 gigabit Ethernet cards.



	  To compile this driver as a module, choose M here: the module

	  will be called ipg.  This is recommended.



source "drivers/net/arcnet/Kconfig"



source "drivers/net/phy/Kconfig"
@@ -1992,6 +1982,16 @@ config E1000E 
	  To compile this driver as a module, choose M here. The module

	  will be called e1000e.



config IP1000

	tristate "IP1000 Gigabit Ethernet support"

	depends on PCI && EXPERIMENTAL

	select MII

	---help---

	  This driver supports IP1000 gigabit Ethernet cards.



	  To compile this driver as a module, choose M here: the module

	  will be called ipg.  This is recommended.



source "drivers/net/ixp2000/Kconfig"



config MYRI_SBUS

drivers/net/fs_enet/fs_enet-main.c

+9 −2
Original line number Diff line number Diff line
@@ -894,14 +894,21 @@ static void fs_get_regs(struct net_device *dev, struct ethtool_regs *regs, 
static int fs_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)

{

	struct fs_enet_private *fep = netdev_priv(dev);



	if (!fep->phydev)

		return -ENODEV;



	return phy_ethtool_gset(fep->phydev, cmd);

}



static int fs_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)

{

	struct fs_enet_private *fep = netdev_priv(dev);

	phy_ethtool_sset(fep->phydev, cmd);

	return 0;



	if (!fep->phydev)

		return -ENODEV;



	return phy_ethtool_sset(fep->phydev, cmd);

}



static int fs_nway_reset(struct net_device *dev)

drivers/net/loopback.c

+1 −1
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ static void loopback_setup(struct net_device *dev) 
		| NETIF_F_NO_CSUM

		| NETIF_F_HIGHDMA

		| NETIF_F_LLTX

		| NETIF_F_NETNS_LOCAL,

		| NETIF_F_NETNS_LOCAL;

	dev->ethtool_ops	= &loopback_ethtool_ops;

	dev->header_ops		= &eth_header_ops;

	dev->init = loopback_dev_init;