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

Commit 334fbbb7 authored by Guo-Fu Tseng's avatar Guo-Fu Tseng Committed by David S. Miller
Browse files

jme: Adding mii-tool support 



Adding mii-tool support for some distribution only have mii-tool
installed by default.

Signed-off-by: default avatarGuo-Fu Tseng <cooldavid@cooldavid.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ea192aa8

drivers/net/jme.c

+33 −1
Original line number Diff line number Diff line
@@ -2411,8 +2411,37 @@ jme_set_settings(struct net_device *netdev, 
	if (!rc) {

		if (fdc)

			jme_reset_link(jme);

		set_bit(JME_FLAG_SSET, &jme->flags);

		jme->old_ecmd = *ecmd;

		set_bit(JME_FLAG_SSET, &jme->flags);

	}



	return rc;

}



static int

jme_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd)

{

	int rc;

	struct jme_adapter *jme = netdev_priv(netdev);

	struct mii_ioctl_data *mii_data = if_mii(rq);

	unsigned int duplex_chg;



	if (cmd == SIOCSMIIREG) {

		u16 val = mii_data->val_in;

		if (!(val & (BMCR_RESET|BMCR_ANENABLE)) &&

		    (val & BMCR_SPEED1000))

			return -EINVAL;

	}



	spin_lock_bh(&jme->phy_lock);

	rc = generic_mii_ioctl(&jme->mii_if, mii_data, cmd, &duplex_chg);

	spin_unlock_bh(&jme->phy_lock);



	if (!rc && (cmd == SIOCSMIIREG)) {

		if (duplex_chg)

			jme_reset_link(jme);

		jme_get_settings(netdev, &jme->old_ecmd);

		set_bit(JME_FLAG_SSET, &jme->flags);

	}



	return rc;
@@ -2692,6 +2721,7 @@ static const struct net_device_ops jme_netdev_ops = { 
	.ndo_open		= jme_open,

	.ndo_stop		= jme_close,

	.ndo_validate_addr	= eth_validate_addr,

	.ndo_do_ioctl		= jme_ioctl,

	.ndo_start_xmit		= jme_start_xmit,

	.ndo_set_mac_address	= jme_set_macaddr,

	.ndo_set_multicast_list	= jme_set_multi,
@@ -2883,6 +2913,8 @@ jme_init_one(struct pci_dev *pdev, 
		jme->mii_if.supports_gmii = true;

	else

		jme->mii_if.supports_gmii = false;

	jme->mii_if.phy_id_mask = 0x1F;

	jme->mii_if.reg_num_mask = 0x1F;

	jme->mii_if.mdio_read = jme_mdio_read;

	jme->mii_if.mdio_write = jme_mdio_write;