Commit 17032ae3 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'qeth-next' 



Ursula Braun says:

====================
s390: network patches for net-next

here are s390 related patches for net-next
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents b9fbe709 89a2a8e7

Documentation/s390/qeth.txt

+2 −2
Original line number Diff line number Diff line 
IBM s390 QDIO Ethernet Driver



HiperSockets Bridge Port Support

OSA and HiperSockets Bridge Port Support



Uevents
@@ -8,7 +8,7 @@ To generate the events the device must be assigned a role of either 
a primary or a secondary Bridge Port. For more information, see

"z/VM Connectivity, SC24-6174".



When run on HiperSockets Bridge Capable Port hardware, and the state

When run on an OSA or HiperSockets Bridge Capable Port hardware, and the state

of some configured Bridge Port device on the channel changes, a udev

event with ACTION=CHANGE is emitted on behalf of the corresponding

ccwgroup device. The event has the following attributes:

drivers/s390/net/lcs.c

+1 −1
Original line number Diff line number Diff line
@@ -2150,7 +2150,7 @@ lcs_new_device(struct ccwgroup_device *ccwgdev) 
	rc = lcs_detect(card);

	if (rc) {

		LCS_DBF_TEXT(2, setup, "dtctfail");

		dev_err(&card->dev->dev,

		dev_err(&ccwgdev->dev,

			"Detecting a network adapter for LCS devices"

			" failed with rc=%d (0x%x)\n", rc, rc);

		lcs_stopcard(card);

drivers/s390/net/qeth_core.h

+2 −0
Original line number Diff line number Diff line
@@ -175,6 +175,8 @@ struct qeth_sbp_info { 
	__u32 supported_funcs;

	enum qeth_sbp_roles role;

	__u32 hostnotification:1;

	__u32 reflect_promisc:1;

	__u32 reflect_promisc_primary:1;

};



static inline int qeth_is_ipa_supported(struct qeth_ipa_info *ipa,

drivers/s390/net/qeth_core_main.c

+2 −1
Original line number Diff line number Diff line
@@ -645,7 +645,8 @@ static struct qeth_ipa_cmd *qeth_check_ipa_data(struct qeth_card *card, 
					card->info.hwtrap = 2;

				qeth_schedule_recovery(card);

				return NULL;

			case IPA_CMD_SETBRIDGEPORT:

			case IPA_CMD_SETBRIDGEPORT_IQD:

			case IPA_CMD_SETBRIDGEPORT_OSA:

			case IPA_CMD_ADDRESS_CHANGE_NOTIF:

				if (card->discipline->control_event_handler

								(card, cmd))

drivers/s390/net/qeth_core_mpc.c

+2 −1
Original line number Diff line number Diff line
@@ -237,6 +237,7 @@ static struct ipa_cmd_names qeth_ipa_cmd_names[] = { 
	{IPA_CMD_DELGMAC,	"delgmac"},

	{IPA_CMD_SETVLAN,	"setvlan"},

	{IPA_CMD_DELVLAN,	"delvlan"},

	{IPA_CMD_SETBRIDGEPORT_OSA,	"set_bridge_port(osa)"},

	{IPA_CMD_SETCCID,	"setccid"},

	{IPA_CMD_DELCCID,	"delccid"},

	{IPA_CMD_MODCCID,	"modccid"},
@@ -249,7 +250,7 @@ static struct ipa_cmd_names qeth_ipa_cmd_names[] = { 
	{IPA_CMD_DELIP,		"delip"},

	{IPA_CMD_SETADAPTERPARMS, "setadapterparms"},

	{IPA_CMD_SET_DIAG_ASS,	"set_diag_ass"},

	{IPA_CMD_SETBRIDGEPORT,	"set_bridge_port"},

	{IPA_CMD_SETBRIDGEPORT_IQD,	"set_bridge_port(hs)"},

	{IPA_CMD_CREATE_ADDR,	"create_addr"},

	{IPA_CMD_DESTROY_ADDR,	"destroy_addr"},

	{IPA_CMD_REGISTER_LOCAL_ADDR,	"register_local_addr"},