s390/qeth: use IS_* helpers for checking device type (379ac99e) · Commits · 戴 / test

drivers/s390/net/qeth_core.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -667,7 +667,7 @@ struct qeth_card_info {
		__u16 func_level;
		char mcl_level[QETH_MCL_LENGTH + 1];
		u8 open_when_online:1;
		int guestlan;
		u8 is_vm_nic:1;
		int mac_bits;
		enum qeth_card_types type;
		enum qeth_link_types link_type;

drivers/s390/net/qeth_core_main.c

+31 −49

Original line number	Diff line number	Diff line
		@@ -85,7 +85,7 @@ static void qeth_close_dev_handler(struct work_struct *work)

		static const char qeth_get_cardname(struct qeth_card card)
		{
		if (card->info.guestlan) {
		if (IS_VM_NIC(card)) {
		switch (card->info.type) {
		case QETH_CARD_TYPE_OSD:
		return " Virtual NIC QDIO";
		@@ -120,7 +120,7 @@ static const char qeth_get_cardname(struct qeth_card card)
		/* max length to be returned: 14 */
		const char qeth_get_cardname_short(struct qeth_card card)
		{
		if (card->info.guestlan) {
		if (IS_VM_NIC(card)) {
		switch (card->info.type) {
		case QETH_CARD_TYPE_OSD:
		return "Virt.NIC QDIO";
		@@ -1330,7 +1330,7 @@ static void qeth_init_qdio_info(struct qeth_card *card)
		/* inbound */
		card->qdio.no_in_queues = 1;
		card->qdio.in_buf_size = QETH_IN_BUF_SIZE_DEFAULT;
		if (card->info.type == QETH_CARD_TYPE_IQD)
		if (IS_IQD(card))
		card->qdio.init_pool.buf_count = QETH_IN_BUF_COUNT_HSDEFAULT;
		else
		card->qdio.init_pool.buf_count = QETH_IN_BUF_COUNT_DEFAULT;
		@@ -1554,7 +1554,7 @@ int qeth_qdio_clear_card(struct qeth_card *card, int use_halt)
		switch (atomic_cmpxchg(&card->qdio.state, QETH_QDIO_ESTABLISHED,
		QETH_QDIO_CLEANING)) {
		case QETH_QDIO_ESTABLISHED:
		if (card->info.type == QETH_CARD_TYPE_IQD)
		if (IS_IQD(card))
		rc = qdio_shutdown(CARD_DDEV(card),
		QDIO_FLAG_CLEANUP_USING_HALT);
		else
		@@ -1627,7 +1627,7 @@ static void qeth_configure_unitaddr(struct qeth_card card, char prcd)
		card->info.chpid = prcd[30];
		card->info.unit_addr2 = prcd[31];
		card->info.cula = prcd[63];
		card->info.guestlan = ((prcd[0x10] == _ascebc['V']) &&
		card->info.is_vm_nic = ((prcd[0x10] == _ascebc['V']) &&
		(prcd[0x11] == _ascebc['M']));
		}

		@@ -1692,12 +1692,10 @@ static enum qeth_discipline_id qeth_enforce_discipline(struct qeth_card *card)
		{
		enum qeth_discipline_id disc = QETH_DISCIPLINE_UNDETERMINED;

		if (card->info.type == QETH_CARD_TYPE_OSM \|\|
		card->info.type == QETH_CARD_TYPE_OSN)
		if (IS_OSM(card) \|\| IS_OSN(card))
		disc = QETH_DISCIPLINE_LAYER2;
		else if (card->info.guestlan)
		disc = (card->info.type == QETH_CARD_TYPE_IQD) ?
		QETH_DISCIPLINE_LAYER3 :
		else if (IS_VM_NIC(card))
		disc = IS_IQD(card) ? QETH_DISCIPLINE_LAYER3 :
		qeth_vm_detect_layer(card);

		switch (disc) {
		@@ -2217,7 +2215,7 @@ static int qeth_ulp_enable_cb(struct qeth_card card, struct qeth_reply reply,
		memcpy(&card->token.ulp_filter_r,
		QETH_ULP_ENABLE_RESP_FILTER_TOKEN(iob->data),
		QETH_MPC_TOKEN_LENGTH);
		if (card->info.type == QETH_CARD_TYPE_IQD) {
		if (IS_IQD(card)) {
		memcpy(&framesize, QETH_ULP_ENABLE_RESP_MAX_MTU(iob->data), 2);
		mtu = qeth_get_mtu_outof_framesize(framesize);
		} else {
		@@ -2555,7 +2553,7 @@ static int qeth_mpc_initialize(struct qeth_card *card)

		return 0;
		out_qdio:
		qeth_qdio_clear_card(card, card->info.type != QETH_CARD_TYPE_IQD);
		qeth_qdio_clear_card(card, !IS_IQD(card));
		qdio_free(CARD_DDEV(card));
		return rc;
		}
		@@ -2578,8 +2576,7 @@ void qeth_print_status_message(struct qeth_card *card)
		}
		/* fallthrough */
		case QETH_CARD_TYPE_IQD:
		if ((card->info.guestlan) \|\|
		(card->info.mcl_level[0] & 0x80)) {
		if (IS_VM_NIC(card) \|\| (card->info.mcl_level[0] & 0x80)) {
		card->info.mcl_level[0] = (char) _ebcasc[(__u8)
		card->info.mcl_level[0]];
		card->info.mcl_level[1] = (char) _ebcasc[(__u8)
		@@ -3237,7 +3234,7 @@ static void qeth_handle_send_error(struct qeth_card *card,
		int sbalf15 = buffer->buffer->element[15].sflags;

		QETH_CARD_TEXT(card, 6, "hdsnderr");
		if (card->info.type == QETH_CARD_TYPE_IQD) {
		if (IS_IQD(card)) {
		if (sbalf15 == 0) {
		qdio_err = 0;
		} else {
		@@ -3334,7 +3331,7 @@ static void qeth_flush_buffers(struct qeth_qdio_out_q *queue, int index,
		if (queue->bufstates)
		queue->bufstates[bidx].user = buf;

		if (queue->card->info.type == QETH_CARD_TYPE_IQD)
		if (IS_IQD(queue->card))
		continue;

		if (!queue->do_pack) {
		@@ -3585,7 +3582,7 @@ static void qeth_qdio_output_handler(struct ccw_device *ccwdev,
		}
		atomic_sub(count, &queue->used_buffers);
		/* check if we need to do something on this outbound queue */
		if (card->info.type != QETH_CARD_TYPE_IQD)
		if (!IS_IQD(card))
		qeth_check_outbound_queue(queue);

		if (IS_IQD(card))
		@@ -4336,8 +4333,7 @@ int qeth_set_access_ctrl_online(struct qeth_card *card, int fallback)

		QETH_CARD_TEXT(card, 4, "setactlo");

		if ((card->info.type == QETH_CARD_TYPE_OSD \|\|
		card->info.type == QETH_CARD_TYPE_OSX) &&
		if ((IS_OSD(card) \|\| IS_OSX(card)) &&
		qeth_adp_supported(card, IPA_SETADP_SET_ACCESS_CONTROL)) {
		rc = qeth_setadpparms_set_access_ctrl(card,
		card->options.isolation, fallback);
		@@ -4503,7 +4499,7 @@ static int qeth_snmp_command(struct qeth_card card, char __user udata)

		QETH_CARD_TEXT(card, 3, "snmpcmd");

		if (card->info.guestlan)
		if (IS_VM_NIC(card))
		return -EOPNOTSUPP;

		if ((!qeth_adp_supported(card, IPA_SETADP_SET_SNMP_CONTROL)) &&
		@@ -4746,14 +4742,6 @@ out:
		}
		EXPORT_SYMBOL_GPL(qeth_vm_request_mac);

		static int qeth_get_qdio_q_format(struct qeth_card *card)
		{
		if (card->info.type == QETH_CARD_TYPE_IQD)
		return QDIO_IQDIO_QFMT;
		else
		return QDIO_QETH_QFMT;
		}

		static void qeth_determine_capabilities(struct qeth_card *card)
		{
		int rc;
		@@ -4892,7 +4880,8 @@ static int qeth_qdio_establish(struct qeth_card *card)

		memset(&init_data, 0, sizeof(struct qdio_initialize));
		init_data.cdev = CARD_DDEV(card);
		init_data.q_format = qeth_get_qdio_q_format(card);
		init_data.q_format = IS_IQD(card) ? QDIO_IQDIO_QFMT :
		QDIO_QETH_QFMT;
		init_data.qib_param_field_format = 0;
		init_data.qib_param_field = qib_param_field;
		init_data.no_input_qs = card->qdio.no_in_queues;
		@@ -4904,8 +4893,7 @@ static int qeth_qdio_establish(struct qeth_card *card)
		init_data.input_sbal_addr_array = in_sbal_ptrs;
		init_data.output_sbal_addr_array = out_sbal_ptrs;
		init_data.output_sbal_state_array = card->qdio.out_bufstates;
		init_data.scan_threshold =
		(card->info.type == QETH_CARD_TYPE_IQD) ? 1 : 32;
		init_data.scan_threshold = IS_IQD(card) ? 1 : 32;

		if (atomic_cmpxchg(&card->qdio.state, QETH_QDIO_ALLOCATED,
		QETH_QDIO_ESTABLISHED) == QETH_QDIO_ALLOCATED) {
		@@ -5007,7 +4995,7 @@ retry:
		if (retries < 3)
		QETH_DBF_MESSAGE(2, "Retrying to do IDX activates on device %x.\n",
		CARD_DEVID(card));
		rc = qeth_qdio_clear_card(card, card->info.type != QETH_CARD_TYPE_IQD);
		rc = qeth_qdio_clear_card(card, !IS_IQD(card));
		ccw_device_set_offline(CARD_DDEV(card));
		ccw_device_set_offline(CARD_WDEV(card));
		ccw_device_set_offline(CARD_RDEV(card));
		@@ -5189,7 +5177,7 @@ struct sk_buff qeth_core_get_next_skb(struct qeth_card card,
		return NULL;

		if (((skb_len >= card->options.rx_sg_cb) &&
		(!(card->info.type == QETH_CARD_TYPE_OSN)) &&
		!IS_OSN(card) &&
		(!atomic_read(&card->force_alloc_skb))) \|\|
		(card->options.cq == QETH_CQ_ENABLED))
		use_rx_sg = 1;
		@@ -5687,9 +5675,8 @@ static int qeth_core_probe_device(struct ccwgroup_device *gdev)
		if (rc)
		goto err_load;

		gdev->dev.type = (card->info.type != QETH_CARD_TYPE_OSN)
		? card->discipline->devtype
		: &qeth_osn_devtype;
		gdev->dev.type = IS_OSN(card) ? &qeth_osn_devtype :
		card->discipline->devtype;
		rc = card->discipline->setup(card->gdev);
		if (rc)
		goto err_disc;
		@@ -5733,10 +5720,8 @@ static int qeth_core_set_online(struct ccwgroup_device *gdev)
		enum qeth_discipline_id def_discipline;

		if (!card->discipline) {
		if (card->info.type == QETH_CARD_TYPE_IQD)
		def_discipline = QETH_DISCIPLINE_LAYER3;
		else
		def_discipline = QETH_DISCIPLINE_LAYER2;
		def_discipline = IS_IQD(card) ? QETH_DISCIPLINE_LAYER3 :
		QETH_DISCIPLINE_LAYER2;
		rc = qeth_core_load_discipline(card, def_discipline);
		if (rc)
		goto err;
		@@ -5864,12 +5849,9 @@ int qeth_do_ioctl(struct net_device dev, struct ifreq rq, int cmd)
		rc = qeth_snmp_command(card, rq->ifr_ifru.ifru_data);
		break;
		case SIOC_QETH_GET_CARD_TYPE:
		if ((card->info.type == QETH_CARD_TYPE_OSD \|\|
		card->info.type == QETH_CARD_TYPE_OSM \|\|
		card->info.type == QETH_CARD_TYPE_OSX) &&
		!card->info.guestlan)
		if ((IS_OSD(card) \|\| IS_OSM(card) \|\| IS_OSX(card)) &&
		!IS_VM_NIC(card))
		return 1;
		else
		return 0;
		case SIOCGMIIPHY:
		mii_data = if_mii(rq);

drivers/s390/net/qeth_core_mpc.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -82,7 +82,7 @@ enum qeth_card_types {
		#define IS_OSM(card) ((card)->info.type == QETH_CARD_TYPE_OSM)
		#define IS_OSN(card) ((card)->info.type == QETH_CARD_TYPE_OSN)
		#define IS_OSX(card) ((card)->info.type == QETH_CARD_TYPE_OSX)
		#define IS_VM_NIC(card) ((card)->info.guestlan)
		#define IS_VM_NIC(card) ((card)->info.is_vm_nic)

		#define QETH_MPC_DIFINFO_LEN_INDICATES_LINK_TYPE 0x18
		/* only the first two bytes are looked at in qeth_get_cardname_short */

drivers/s390/net/qeth_core_sys.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -479,8 +479,7 @@ static ssize_t qeth_dev_isolation_store(struct device *dev,
		return -EINVAL;

		mutex_lock(&card->conf_mutex);
		if (card->info.type != QETH_CARD_TYPE_OSD &&
		card->info.type != QETH_CARD_TYPE_OSX) {
		if (!IS_OSD(card) && !IS_OSX(card)) {
		rc = -EOPNOTSUPP;
		dev_err(&card->gdev->dev, "Adapter does not "
		"support QDIO data connection isolation\n");

drivers/s390/net/qeth_l2_main.c

+6 −9

Original line number	Diff line number	Diff line
		@@ -336,7 +336,7 @@ static int qeth_l2_process_inbound_buffer(struct qeth_card *card,
		napi_gro_receive(&card->napi, skb);
		break;
		case QETH_HEADER_TYPE_OSN:
		if (card->info.type == QETH_CARD_TYPE_OSN) {
		if (IS_OSN(card)) {
		skb_push(skb, sizeof(struct qeth_hdr));
		skb_copy_to_linear_data(skb, hdr,
		sizeof(struct qeth_hdr));
		@@ -387,8 +387,7 @@ static int qeth_l2_request_initial_mac(struct qeth_card *card)
		}

		/* some devices don't support a custom MAC address: */
		if (card->info.type == QETH_CARD_TYPE_OSM \|\|
		card->info.type == QETH_CARD_TYPE_OSX)
		if (IS_OSM(card) \|\| IS_OSX(card))
		return (rc) ? rc : -EADDRNOTAVAIL;
		eth_hw_addr_random(card->dev);

		@@ -733,7 +732,7 @@ static int qeth_l2_setup_netdev(struct qeth_card *card, bool carrier_ok)
		card->dev->features \|= NETIF_F_HW_VLAN_CTAG_FILTER;
		}

		if (card->info.type == QETH_CARD_TYPE_OSD && !card->info.guestlan) {
		if (IS_OSD(card) && !IS_VM_NIC(card)) {
		card->dev->features \|= NETIF_F_SG;
		/* OSA 3S and earlier has no RX/TX support */
		if (qeth_is_supported(card, IPA_OUTBOUND_CHECKSUM)) {
		@@ -843,8 +842,7 @@ static int qeth_l2_set_online(struct ccwgroup_device *gdev)
		/* softsetup */
		QETH_DBF_TEXT(SETUP, 2, "softsetp");

		if ((card->info.type == QETH_CARD_TYPE_OSD) \|\|
		(card->info.type == QETH_CARD_TYPE_OSX)) {
		if (IS_OSD(card) \|\| IS_OSX(card)) {
		rc = qeth_l2_start_ipassists(card);
		if (rc)
		goto out_remove;
		@@ -1468,8 +1466,7 @@ static struct qeth_cmd_buffer qeth_sbp_build_cmd(struct qeth_card card,
		enum qeth_ipa_sbp_cmd sbp_cmd,
		unsigned int cmd_length)
		{
		enum qeth_ipa_cmds ipa_cmd = (card->info.type == QETH_CARD_TYPE_IQD) ?
		IPA_CMD_SETBRIDGEPORT_IQD :
		enum qeth_ipa_cmds ipa_cmd = IS_IQD(card) ? IPA_CMD_SETBRIDGEPORT_IQD :
		IPA_CMD_SETBRIDGEPORT_OSA;
		struct qeth_cmd_buffer *iob;
		struct qeth_ipa_cmd *cmd;

Admin message