From dab221e0fd8a0001c27c1204eef060b1c599b7ce Mon Sep 17 00:00:00 2001 From: Frank Blaschka Date: Fri, 6 Jun 2008 12:37:44 +0200 Subject: [PATCH] --- yaml --- r: 97947 b: refs/heads/master c: e5bd7be56787f8c5042081157fff983bcf0c8a42 h: refs/heads/master i: 97945: f8471771e35c4b5838e0cc6ab4b2eeb3f92d75a1 97943: 690a2dcc37a687dc99b2c78df08154f3833c31be v: v3 --- [refs] | 2 +- trunk/drivers/s390/net/qeth_l3_main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 573e6f6898f5..6c9943bc923c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 363f15149cfba67d29f1e6a6103dda079f27f3fa +refs/heads/master: e5bd7be56787f8c5042081157fff983bcf0c8a42 diff --git a/trunk/drivers/s390/net/qeth_l3_main.c b/trunk/drivers/s390/net/qeth_l3_main.c index 94a8ead64ed4..b041ea8c9577 100644 --- a/trunk/drivers/s390/net/qeth_l3_main.c +++ b/trunk/drivers/s390/net/qeth_l3_main.c @@ -2070,7 +2070,7 @@ static struct qeth_card *qeth_l3_get_card_from_dev(struct net_device *dev) card = netdev_priv(dev); else if (rc == QETH_VLAN_CARD) card = netdev_priv(vlan_dev_info(dev)->real_dev); - if (card->options.layer2) + if (card && card->options.layer2) card = NULL; QETH_DBF_TEXT_(TRACE, 4, "%d", rc); return card ;