diff options
author | Patrick McHardy <kaber@trash.net> | 2008-01-21 03:26:07 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 18:08:32 -0500 |
commit | 9dfebcc6479c55c001e4bb5fe7cc16b6799c43a7 (patch) | |
tree | d933aad54aa6025d0394b48a4a816867c1333e3e /drivers/s390 | |
parent | af30151709bcace1ca844d4bb8b7e2e392ff81eb (diff) |
[VLAN]: Turn VLAN_DEV_INFO into inline function
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/s390')
-rw-r--r-- | drivers/s390/net/qeth_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
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 ; |