diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/cxgb3/l2t.c | 2 | ||||
-rw-r--r-- | drivers/s390/net/qeth_main.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/cxgb3/l2t.c b/drivers/net/cxgb3/l2t.c index d660af74606e..17ed4c3527b7 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, | |||
337 | atomic_set(&e->refcnt, 1); | 337 | atomic_set(&e->refcnt, 1); |
338 | neigh_replace(e, neigh); | 338 | neigh_replace(e, neigh); |
339 | if (neigh->dev->priv_flags & IFF_802_1Q_VLAN) | 339 | if (neigh->dev->priv_flags & IFF_802_1Q_VLAN) |
340 | e->vlan = VLAN_DEV_INFO(neigh->dev)->vlan_id; | 340 | e->vlan = vlan_dev_info(neigh->dev)->vlan_id; |
341 | else | 341 | else |
342 | e->vlan = VLAN_NONE; | 342 | e->vlan = VLAN_NONE; |
343 | spin_unlock(&e->lock); | 343 | spin_unlock(&e->lock); |
diff --git a/drivers/s390/net/qeth_main.c b/drivers/s390/net/qeth_main.c index f1866a283850..62606ce26e55 100644 --- a/drivers/s390/net/qeth_main.c +++ b/drivers/s390/net/qeth_main.c | |||
@@ -3890,7 +3890,7 @@ qeth_verify_vlan_dev(struct net_device *dev, struct qeth_card *card) | |||
3890 | break; | 3890 | break; |
3891 | } | 3891 | } |
3892 | } | 3892 | } |
3893 | if (rc && !(VLAN_DEV_INFO(dev)->real_dev->priv == (void *)card)) | 3893 | if (rc && !(vlan_dev_info(dev)->real_dev->priv == (void *)card)) |
3894 | return 0; | 3894 | return 0; |
3895 | 3895 | ||
3896 | #endif | 3896 | #endif |
@@ -3930,7 +3930,7 @@ qeth_get_card_from_dev(struct net_device *dev) | |||
3930 | card = (struct qeth_card *)dev->priv; | 3930 | card = (struct qeth_card *)dev->priv; |
3931 | else if (rc == QETH_VLAN_CARD) | 3931 | else if (rc == QETH_VLAN_CARD) |
3932 | card = (struct qeth_card *) | 3932 | card = (struct qeth_card *) |
3933 | VLAN_DEV_INFO(dev)->real_dev->priv; | 3933 | vlan_dev_info(dev)->real_dev->priv; |
3934 | 3934 | ||
3935 | QETH_DBF_TEXT_(trace, 4, "%d", rc); | 3935 | QETH_DBF_TEXT_(trace, 4, "%d", rc); |
3936 | return card ; | 3936 | return card ; |