diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2012-02-22 20:36:17 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2012-02-22 20:36:17 -0500 |
| commit | daefd89efc279b142bbb054577c2d706da211723 (patch) | |
| tree | 2298056232548f6f22d7bbff2662a2bbf64520de /drivers/net/macvlan.c | |
| parent | 6e33aceda2d82126e9d08a39e21a15be0dd00a6c (diff) | |
| parent | f86bcc302a8c570dd0f5a50097a6af96a0e717c2 (diff) | |
Merge branch 'for_3.4/gpio/runtime-pm-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into gpio/next
Diffstat (limited to 'drivers/net/macvlan.c')
| -rw-r--r-- | drivers/net/macvlan.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c index f2f820c4b40a..9ea99217f116 100644 --- a/drivers/net/macvlan.c +++ b/drivers/net/macvlan.c | |||
| @@ -173,6 +173,7 @@ static rx_handler_result_t macvlan_handle_frame(struct sk_buff **pskb) | |||
| 173 | skb = ip_check_defrag(skb, IP_DEFRAG_MACVLAN); | 173 | skb = ip_check_defrag(skb, IP_DEFRAG_MACVLAN); |
| 174 | if (!skb) | 174 | if (!skb) |
| 175 | return RX_HANDLER_CONSUMED; | 175 | return RX_HANDLER_CONSUMED; |
| 176 | eth = eth_hdr(skb); | ||
| 176 | src = macvlan_hash_lookup(port, eth->h_source); | 177 | src = macvlan_hash_lookup(port, eth->h_source); |
| 177 | if (!src) | 178 | if (!src) |
| 178 | /* frame comes from an external address */ | 179 | /* frame comes from an external address */ |