diff --git a/[refs] b/[refs] index bb9ebe5738e0..51dcc5e19f5a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: af9debd461d10fe582c9c0e80eafa69f698331ed +refs/heads/master: 0b7f22aab4e960c75e82ad696ef852f9b0015e7d diff --git a/trunk/net/ipv4/route.c b/trunk/net/ipv4/route.c index 726ea5e8180a..d675ff80b04d 100644 --- a/trunk/net/ipv4/route.c +++ b/trunk/net/ipv4/route.c @@ -1685,7 +1685,7 @@ static void ip_handle_martian_source(struct net_device *dev, printk(KERN_WARNING "martian source %u.%u.%u.%u from " "%u.%u.%u.%u, on dev %s\n", NIPQUAD(daddr), NIPQUAD(saddr), dev->name); - if (dev->hard_header_len) { + if (dev->hard_header_len && skb->mac.raw) { int i; unsigned char *p = skb->mac.raw; printk(KERN_WARNING "ll header: ");