Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 71c46897 authored by Ursula Braun's avatar Ursula Braun Committed by David S. Miller
Browse files

s390/net: set HW port number in netdevice 



struct net_device contains a dev_port field. Store the OSA port number
in this field.

Signed-off-by: default avatarUrsula Braun <ubraun@linux.ibm.com>
Reviewed-by: default avatarJulian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: default avatarJulian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d8de0ddf

drivers/s390/net/lcs.c

+3 −0
Original line number Diff line number Diff line
@@ -1928,6 +1928,8 @@ lcs_portno_store (struct device *dev, struct device_attribute *attr, const char 
		return -EINVAL;

        /* TODO: sanity checks */

        card->portno = value;

	if (card->dev)

		card->dev->dev_port = card->portno;



        return count;
@@ -2158,6 +2160,7 @@ lcs_new_device(struct ccwgroup_device *ccwgdev) 
	card->dev = dev;

	card->dev->ml_priv = card;

	card->dev->netdev_ops = &lcs_netdev_ops;

	card->dev->dev_port = card->portno;

	memcpy(card->dev->dev_addr, card->mac, LCS_MAC_LENGTH);

#ifdef CONFIG_IP_MULTICAST

	if (!lcs_check_multicast_support(card))

drivers/s390/net/qeth_core_sys.c

+2 −0
Original line number Diff line number Diff line
@@ -144,6 +144,8 @@ static ssize_t qeth_dev_portno_store(struct device *dev, 
		goto out;

	}

	card->info.portno = portno;

	if (card->dev)

		card->dev->dev_port = portno;

out:

	mutex_unlock(&card->conf_mutex);

	return rc ? rc : count;

drivers/s390/net/qeth_l2_main.c

+1 −0
Original line number Diff line number Diff line
@@ -984,6 +984,7 @@ static int qeth_l2_setup_netdev(struct qeth_card *card) 
	card->dev->mtu = card->info.initial_mtu;

	card->dev->min_mtu = 64;

	card->dev->max_mtu = ETH_MAX_MTU;

	card->dev->dev_port = card->info.portno;

	card->dev->netdev_ops = &qeth_l2_netdev_ops;

	if (card->info.type == QETH_CARD_TYPE_OSN) {

		card->dev->ethtool_ops = &qeth_l2_osn_ops;

drivers/s390/net/qeth_l3_main.c

+1 −0
Original line number Diff line number Diff line
@@ -2576,6 +2576,7 @@ static int qeth_l3_setup_netdev(struct qeth_card *card) 
	card->dev->mtu = card->info.initial_mtu;

	card->dev->min_mtu = 64;

	card->dev->max_mtu = ETH_MAX_MTU;

	card->dev->dev_port = card->info.portno;

	card->dev->ethtool_ops = &qeth_l3_ethtool_ops;

	card->dev->features |=	NETIF_F_HW_VLAN_CTAG_TX |

				NETIF_F_HW_VLAN_CTAG_RX |