aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/s390/net
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2008-07-08 06:23:57 -0400
committerDavid S. Miller <davem@davemloft.net>2008-07-08 06:23:57 -0400
commit22d1ba74bbafa96d3f425cc12714d3fe8675183f (patch)
tree5fdc18001037a667e95229dbc34130b7210e8c8c /drivers/s390/net
parent7750f403cbe56971336d575b354365190b4e3227 (diff)
vlan: move struct vlan_dev_info to private header
Hide struct vlan_dev_info from drivers to prevent them from growing more creative ways to use it. Provide accessors for the two drivers that currently use it. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/s390/net')
-rw-r--r--drivers/s390/net/qeth_l3_main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c
index 999552c83bbe..85be40abdda9 100644
--- a/drivers/s390/net/qeth_l3_main.c
+++ b/drivers/s390/net/qeth_l3_main.c
@@ -2020,7 +2020,7 @@ static int qeth_l3_verify_vlan_dev(struct net_device *dev,
2020 } 2020 }
2021 } 2021 }
2022 2022
2023 if (rc && !(netdev_priv(vlan_dev_info(dev)->real_dev) == (void *)card)) 2023 if (rc && !(netdev_priv(vlan_dev_real_dev(dev)) == (void *)card))
2024 return 0; 2024 return 0;
2025 2025
2026 return rc; 2026 return rc;
@@ -2056,7 +2056,7 @@ static struct qeth_card *qeth_l3_get_card_from_dev(struct net_device *dev)
2056 if (rc == QETH_REAL_CARD) 2056 if (rc == QETH_REAL_CARD)
2057 card = netdev_priv(dev); 2057 card = netdev_priv(dev);
2058 else if (rc == QETH_VLAN_CARD) 2058 else if (rc == QETH_VLAN_CARD)
2059 card = netdev_priv(vlan_dev_info(dev)->real_dev); 2059 card = netdev_priv(vlan_dev_real_dev(dev));
2060 if (card && card->options.layer2) 2060 if (card && card->options.layer2)
2061 card = NULL; 2061 card = NULL;
2062 QETH_DBF_TEXT_(TRACE, 4, "%d", rc); 2062 QETH_DBF_TEXT_(TRACE, 4, "%d", rc);