Commit 8ca769e2 authored by Julian Wiedmann's avatar Julian Wiedmann Committed by David S. Miller
Browse files

s390/qeth: shift some bridgeport code around 



qeth_l2_setup_bridgeport_attrs() is entirely unrelated to sysfs
functionality, move it where it belongs.
While at it merge all the bridgeport-specific code in the set-online
path together.

Signed-off-by: default avatarJulian Wiedmann <jwi@linux.ibm.com>
Reviewed-by: default avatarAlexandra Winter <wintera@linux.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 14a1d246

drivers/s390/net/qeth_l2.h

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ extern const struct attribute_group *qeth_l2_attr_groups[]; 


int qeth_l2_create_device_attributes(struct device *);

void qeth_l2_remove_device_attributes(struct device *);

void qeth_l2_setup_bridgeport_attrs(struct qeth_card *card);

int qeth_bridgeport_query_ports(struct qeth_card *card,

				enum qeth_sbp_roles *role,

				enum qeth_sbp_states *state);

drivers/s390/net/qeth_l2_main.c

+22 −4
Original line number Diff line number Diff line
@@ -728,6 +728,24 @@ static void qeth_l2_trace_features(struct qeth_card *card) 
		      sizeof(card->options.vnicc.sup_chars));

}



static void qeth_l2_setup_bridgeport_attrs(struct qeth_card *card)

{

	if (!card->options.sbp.reflect_promisc &&

	    card->options.sbp.role != QETH_SBP_ROLE_NONE) {

		/* Conditional to avoid spurious error messages */

		qeth_bridgeport_setrole(card, card->options.sbp.role);

		/* Let the callback function refresh the stored role value. */

		qeth_bridgeport_query_ports(card, &card->options.sbp.role,

					    NULL);

	}

	if (card->options.sbp.hostnotification) {

		if (qeth_bridgeport_an_set(card, 1))

			card->options.sbp.hostnotification = 0;

	} else {

		qeth_bridgeport_an_set(card, 0);

	}

}



static int qeth_l2_set_online(struct ccwgroup_device *gdev)

{

	struct qeth_card *card = dev_get_drvdata(&gdev->dev);
@@ -748,9 +766,11 @@ static int qeth_l2_set_online(struct ccwgroup_device *gdev) 


	mutex_lock(&card->sbp_lock);

	qeth_bridgeport_query_support(card);

	if (card->options.sbp.supported_funcs)

	if (card->options.sbp.supported_funcs) {

		qeth_l2_setup_bridgeport_attrs(card);

		dev_info(&card->gdev->dev,

			 "The device represents a Bridge Capable Port\n");

	}

	mutex_unlock(&card->sbp_lock);



	qeth_l2_register_dev_addr(card);
@@ -761,8 +781,6 @@ static int qeth_l2_set_online(struct ccwgroup_device *gdev) 
	qeth_trace_features(card);

	qeth_l2_trace_features(card);



	qeth_l2_setup_bridgeport_attrs(card);



	card->state = CARD_STATE_HARDSETUP;

	qeth_print_status_message(card);

drivers/s390/net/qeth_l2_sys.c

+0 −34
Original line number Diff line number Diff line
@@ -246,40 +246,6 @@ static struct attribute_group qeth_l2_bridgeport_attr_group = { 
	.attrs = qeth_l2_bridgeport_attrs,

};



/**

 * qeth_l2_setup_bridgeport_attrs() - set/restore attrs when turning online.

 * @card:			      qeth_card structure pointer

 *

 * Note: this function is called with conf_mutex held by the caller

 */

void qeth_l2_setup_bridgeport_attrs(struct qeth_card *card)

{

	int rc;



	if (!card)

		return;

	if (!card->options.sbp.supported_funcs)

		return;



	mutex_lock(&card->sbp_lock);

	if (!card->options.sbp.reflect_promisc &&

	    card->options.sbp.role != QETH_SBP_ROLE_NONE) {

		/* Conditional to avoid spurious error messages */

		qeth_bridgeport_setrole(card, card->options.sbp.role);

		/* Let the callback function refresh the stored role value. */

		qeth_bridgeport_query_ports(card,

			&card->options.sbp.role, NULL);

	}

	if (card->options.sbp.hostnotification) {

		rc = qeth_bridgeport_an_set(card, 1);

		if (rc)

			card->options.sbp.hostnotification = 0;

	} else {

		qeth_bridgeport_an_set(card, 0);

	}

	mutex_unlock(&card->sbp_lock);

}



/* VNIC CHARS support */



/* convert sysfs attr name to VNIC characteristic */

CRA Git | Maintained and supported by SUSTech CRA and CCSE