diff --git a/[refs] b/[refs] index 40dd8f465af6..f445211c867e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 28f7b0360f46eeb9eeee63d03bb5484918a54837 +refs/heads/master: d71fce6b932d83e0a1caa49dfa5a536fd50f07c9 diff --git a/trunk/drivers/s390/net/qeth_main.c b/trunk/drivers/s390/net/qeth_main.c index c67e7dfd56cc..a2d08c9ba3c4 100644 --- a/trunk/drivers/s390/net/qeth_main.c +++ b/trunk/drivers/s390/net/qeth_main.c @@ -6580,11 +6580,12 @@ qeth_hard_header_parse(const struct sk_buff *skb, unsigned char *haddr) { const struct qeth_card *card; const struct ethhdr *eth; + struct net_device *dev = skb->dev; if (dev->type != ARPHRD_IEEE802_TR) return 0; - card = qeth_get_card_from_dev(skb->dev); + card = qeth_get_card_from_dev(dev); if (card->options.layer2) goto haveheader; #ifdef CONFIG_QETH_IPV6