Commit 1a642469 authored by stephen hemminger's avatar stephen hemminger Committed by David S. Miller
Browse files

benet: convert to set_phys_id 



Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 32d36134

drivers/net/benet/be.h

+1 −0
Original line number Diff line number Diff line
@@ -313,6 +313,7 @@ struct be_adapter { 
	char fw_ver[FW_VER_LEN];

	u32 if_handle;		/* Used to configure filtering */

	u32 pmac_id;		/* MAC addr handle used by BE card */

	u32 beacon_state;	/* for set_phys_id */



	bool eeh_err;

	bool link_up;

drivers/net/benet/be_ethtool.c

+21 −17
Original line number Diff line number Diff line
@@ -526,29 +526,33 @@ be_set_pauseparam(struct net_device *netdev, struct ethtool_pauseparam *ecmd) 
}



static int

be_phys_id(struct net_device *netdev, u32 data)

be_set_phys_id(struct net_device *netdev,

	       enum ethtool_phys_id_state state)

{

	struct be_adapter *adapter = netdev_priv(netdev);

	int status;

	u32 cur;



	be_cmd_get_beacon_state(adapter, adapter->hba_port_num, &cur);



	if (cur == BEACON_STATE_ENABLED)

		return 0;



	if (data < 2)

		data = 2;

	switch (state) {

	case ETHTOOL_ID_ACTIVE:

		be_cmd_get_beacon_state(adapter, adapter->hba_port_num,

					&adapter->beacon_state);

		return -EINVAL;



	status = be_cmd_set_beacon_state(adapter, adapter->hba_port_num, 0, 0,

	case ETHTOOL_ID_ON:

		be_cmd_set_beacon_state(adapter, adapter->hba_port_num, 0, 0,

					BEACON_STATE_ENABLED);

	set_current_state(TASK_INTERRUPTIBLE);

	schedule_timeout(data*HZ);

		break;



	status = be_cmd_set_beacon_state(adapter, adapter->hba_port_num, 0, 0,

	case ETHTOOL_ID_OFF:

		be_cmd_set_beacon_state(adapter, adapter->hba_port_num, 0, 0,

					BEACON_STATE_DISABLED);

		break;



	return status;

	case ETHTOOL_ID_INACTIVE:

		be_cmd_set_beacon_state(adapter, adapter->hba_port_num, 0, 0,

					adapter->beacon_state);

	}



	return 0;

}



static bool
@@ -753,7 +757,7 @@ const struct ethtool_ops be_ethtool_ops = { 
	.get_tso = ethtool_op_get_tso,

	.set_tso = ethtool_op_set_tso,

	.get_strings = be_get_stat_strings,

	.phys_id = be_phys_id,

	.set_phys_id = be_set_phys_id,

	.get_sset_count = be_get_sset_count,

	.get_ethtool_stats = be_get_ethtool_stats,

	.get_regs_len = be_get_reg_len,