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>

2 files changed, 3 insertions, 3 deletions

diff --git a/drivers/net/cxgb3/l2t.c b/drivers/net/cxgb3/l2t.c
index f510140885ae..825e510bd9ed 100644
--- a/drivers/net/cxgb3/l2t.c
+++ b/drivers/net/cxgb3/l2t.c
@@ -337,7 +337,7 @@ struct l2t_entry *t3_l2t_get(struct t3cdev *cdev, struct neighbour *neigh,
                 atomic_set(&e->refcnt, 1);
                 neigh_replace(e, neigh);
                 if (neigh->dev->priv_flags & IFF_802_1Q_VLAN)
-                        e->vlan = vlan_dev_info(neigh->dev)->vlan_id;
+                        e->vlan = vlan_dev_vlan_id(neigh->dev);
                 else
                         e->vlan = VLAN_NONE;
                 spin_unlock(&e->lock);
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,
                 }
         }
 
-        if (rc && !(netdev_priv(vlan_dev_info(dev)->real_dev) == (void *)card))
+        if (rc && !(netdev_priv(vlan_dev_real_dev(dev)) == (void *)card))
                 return 0;
 
         return rc;
@@ -2056,7 +2056,7 @@ static struct qeth_card *qeth_l3_get_card_from_dev(struct net_device *dev)
         if (rc == QETH_REAL_CARD)
                 card = netdev_priv(dev);
         else if (rc == QETH_VLAN_CARD)
-                card = netdev_priv(vlan_dev_info(dev)->real_dev);
+                card = netdev_priv(vlan_dev_real_dev(dev));
         if (card && card->options.layer2)
                 card = NULL;
         QETH_DBF_TEXT_(TRACE, 4, "%d", rc);