Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 67071
b: refs/heads/master
c: d71fce6
h: refs/heads/master
i:
  67069: 5353d49
  67067: 550d282
  67063: 23dcd25
  67055: 7f17a27
  67039: cb7b42b
  67007: 69f8841
  66943: 43fe091
  66815: df0a3b0
  66559: f6416ee
v: v3
  • Loading branch information
Andrew Morton authored and David S. Miller committed Oct 11, 2007
1 parent da8487c commit b1e4fa7
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 28f7b0360f46eeb9eeee63d03bb5484918a54837
refs/heads/master: d71fce6b932d83e0a1caa49dfa5a536fd50f07c9
3 changes: 2 additions & 1 deletion trunk/drivers/s390/net/qeth_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit b1e4fa7

Please sign in to comment.