Commit 2decb0b7 authored by Julian Wiedmann's avatar Julian Wiedmann Committed by David S. Miller
Browse files

s390/qeth: remove .do_ioctl() callback from driver discipline 



With commit 18787eee ("qeth: use ndo_siocdevprivate") this callback
is now actually used to handle transport mode-specific _private_ ioctls.

We only have such ioctls for L3 devices. So wire up a L3-specific
.ndo_siocdevprivate() callback that handles those ioctls, and defers to
the core qeth_siocdevprivate() for all other private ioctls.

This takes the discipline one step closer to its original purpose of
providing an internal extension for the qeth_core_ccwgroup_driver.

Signed-off-by: default avatarJulian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0969becb

drivers/s390/net/qeth_core.h

+0 −2
Original line number Diff line number Diff line
@@ -771,8 +771,6 @@ struct qeth_discipline { 
	void (*remove) (struct ccwgroup_device *);

	int (*set_online)(struct qeth_card *card, bool carrier_ok);

	void (*set_offline)(struct qeth_card *card);

	int (*do_ioctl)(struct net_device *dev, struct ifreq *rq,

			void __user *data, int cmd);

	int (*control_event_handler)(struct qeth_card *card,

					struct qeth_ipa_cmd *cmd);

};

drivers/s390/net/qeth_core_main.c

+1 −4
Original line number Diff line number Diff line
@@ -6600,9 +6600,6 @@ int qeth_siocdevprivate(struct net_device *dev, struct ifreq *rq, void __user *d 
		rc = qeth_query_oat_command(card, data);

		break;

	default:

		if (card->discipline->do_ioctl)

			rc = card->discipline->do_ioctl(dev, rq, data, cmd);

		else

		rc = -EOPNOTSUPP;

	}

	if (rc)

drivers/s390/net/qeth_l2_main.c

+0 −1
Original line number Diff line number Diff line
@@ -2430,7 +2430,6 @@ const struct qeth_discipline qeth_l2_discipline = { 
	.remove = qeth_l2_remove_device,

	.set_online = qeth_l2_set_online,

	.set_offline = qeth_l2_set_offline,

	.do_ioctl = NULL,

	.control_event_handler = qeth_l2_control_event,

};

EXPORT_SYMBOL_GPL(qeth_l2_discipline);

drivers/s390/net/qeth_l3_main.c

+5 −5
Original line number Diff line number Diff line
@@ -1511,7 +1511,8 @@ static int qeth_l3_arp_flush_cache(struct qeth_card *card) 
	return rc;

}



static int qeth_l3_do_ioctl(struct net_device *dev, struct ifreq *rq, void __user *data, int cmd)

static int qeth_l3_ndo_siocdevprivate(struct net_device *dev, struct ifreq *rq,

				      void __user *data, int cmd)

{

	struct qeth_card *card = dev->ml_priv;

	struct qeth_arp_cache_entry arp_entry;
@@ -1552,7 +1553,7 @@ static int qeth_l3_do_ioctl(struct net_device *dev, struct ifreq *rq, void __use 
		rc = qeth_l3_arp_flush_cache(card);

		break;

	default:

		rc = -EOPNOTSUPP;

		rc = qeth_siocdevprivate(dev, rq, data, cmd);

	}

	return rc;

}
@@ -1841,7 +1842,7 @@ static const struct net_device_ops qeth_l3_netdev_ops = { 
	.ndo_validate_addr	= eth_validate_addr,

	.ndo_set_rx_mode	= qeth_l3_set_rx_mode,

	.ndo_eth_ioctl		= qeth_do_ioctl,

	.ndo_siocdevprivate	= qeth_siocdevprivate,

	.ndo_siocdevprivate	= qeth_l3_ndo_siocdevprivate,

	.ndo_fix_features	= qeth_fix_features,

	.ndo_set_features	= qeth_set_features,

	.ndo_tx_timeout		= qeth_tx_timeout,
@@ -1857,7 +1858,7 @@ static const struct net_device_ops qeth_l3_osa_netdev_ops = { 
	.ndo_validate_addr	= eth_validate_addr,

	.ndo_set_rx_mode	= qeth_l3_set_rx_mode,

	.ndo_eth_ioctl		= qeth_do_ioctl,

	.ndo_siocdevprivate	= qeth_siocdevprivate,

	.ndo_siocdevprivate	= qeth_l3_ndo_siocdevprivate,

	.ndo_fix_features	= qeth_fix_features,

	.ndo_set_features	= qeth_set_features,

	.ndo_tx_timeout		= qeth_tx_timeout,
@@ -2071,7 +2072,6 @@ const struct qeth_discipline qeth_l3_discipline = { 
	.remove = qeth_l3_remove_device,

	.set_online = qeth_l3_set_online,

	.set_offline = qeth_l3_set_offline,

	.do_ioctl = qeth_l3_do_ioctl,

	.control_event_handler = qeth_l3_control_event,

};

EXPORT_SYMBOL_GPL(qeth_l3_discipline);