[PATCH] net: fix bonding with spider_net (054034db) · Commits · 戴 / test

drivers/net/spider_net.c

+12 −6

Original line number	Diff line number	Diff line
		@@ -1292,23 +1292,29 @@ static int
		spider_net_set_mac(struct net_device netdev, void p)
		{
		struct spider_net_card *card = netdev_priv(netdev);
		u32 macl, macu;
		u32 macl, macu, regvalue;
		struct sockaddr *addr = p;

		/* GMACTPE and GMACRPE must be off, so we only allow this, if
		* the device is down */
		if (netdev->flags & IFF_UP)
		return -EBUSY;

		if (!is_valid_ether_addr(addr->sa_data))
		return -EADDRNOTAVAIL;

		/* switch off GMACTPE and GMACRPE */
		regvalue = spider_net_read_reg(card, SPIDER_NET_GMACOPEMD);
		regvalue &= ~((1 << 5) \| (1 << 6));
		spider_net_write_reg(card, SPIDER_NET_GMACOPEMD, regvalue);

		/* write mac */
		macu = (addr->sa_data[0]<<24) + (addr->sa_data[1]<<16) +
		(addr->sa_data[2]<<8) + (addr->sa_data[3]);
		macl = (addr->sa_data[4]<<8) + (addr->sa_data[5]);
		spider_net_write_reg(card, SPIDER_NET_GMACUNIMACU, macu);
		spider_net_write_reg(card, SPIDER_NET_GMACUNIMACL, macl);

		/* switch GMACTPE and GMACRPE back on */
		regvalue = spider_net_read_reg(card, SPIDER_NET_GMACOPEMD);
		regvalue \|= ((1 << 5) \| (1 << 6));
		spider_net_write_reg(card, SPIDER_NET_GMACOPEMD, regvalue);

		spider_net_set_promisc(card);

		/* look up, whether we have been successful */

+19 −0

Original line number	Diff line number	Diff line
		@@ -27,6 +27,24 @@

		#include "spider_net.h"

		static int
		spider_net_ethtool_get_settings(struct net_device *netdev,
		struct ethtool_cmd *cmd)
		{
		struct spider_net_card *card;
		card = netdev_priv(netdev);

		cmd->supported = (SUPPORTED_1000baseT_Full \|
		SUPPORTED_FIBRE);
		cmd->advertising = (ADVERTISED_1000baseT_Full \|
		ADVERTISED_FIBRE);
		cmd->port = PORT_FIBRE;
		cmd->speed = card->phy.speed;
		cmd->duplex = DUPLEX_FULL;

		return 0;
		}

		static void
		spider_net_ethtool_get_drvinfo(struct net_device *netdev,
		struct ethtool_drvinfo *drvinfo)
		@@ -96,6 +114,7 @@ spider_net_ethtool_set_rx_csum(struct net_device *netdev, u32 n)
		}

		struct ethtool_ops spider_net_ethtool_ops = {
		.get_settings = spider_net_ethtool_get_settings,
		.get_drvinfo = spider_net_ethtool_get_drvinfo,
		.get_wol = spider_net_ethtool_get_wol,
		.get_msglevel = spider_net_ethtool_get_msglevel,