From 1d95d1734f77417944bc3257821ef57bdbed147c Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Mon, 23 Jan 2012 05:38:59 +0000 Subject: [PATCH] --- yaml --- r: 286698 b: refs/heads/master c: 4ec7ac1203bcf21f5e3d977c9818b1a56c9ef40d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/macvlan.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 325e3838cb6a..8eceb071fea2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f80400a26a2e8bff541de12834a1134358bb6642 +refs/heads/master: 4ec7ac1203bcf21f5e3d977c9818b1a56c9ef40d diff --git a/trunk/drivers/net/macvlan.c b/trunk/drivers/net/macvlan.c index f2f820c4b40a..9ea99217f116 100644 --- a/trunk/drivers/net/macvlan.c +++ b/trunk/drivers/net/macvlan.c @@ -173,6 +173,7 @@ static rx_handler_result_t macvlan_handle_frame(struct sk_buff **pskb) skb = ip_check_defrag(skb, IP_DEFRAG_MACVLAN); if (!skb) return RX_HANDLER_CONSUMED; + eth = eth_hdr(skb); src = macvlan_hash_lookup(port, eth->h_source); if (!src) /* frame comes from an external address */