From 297027622d7835a705419bc2f19093a403c924e5 Mon Sep 17 00:00:00 2001 From: "sg.tweak@gmail.com" Date: Wed, 10 Jun 2009 09:55:02 +0000 Subject: [PATCH] --- yaml --- r: 150829 b: refs/heads/master c: ef5c89967d50042b29937fb724e057c1aa3c5207 h: refs/heads/master i: 150827: 5ccf863f0aaff586258037e79fc138296f7e917e v: v3 --- [refs] | 2 +- trunk/drivers/net/macvlan.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index c468c6ff4804..bd092bfb72df 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 720017623ab294b66c8a95d7bc5ccf75a581ebe4 +refs/heads/master: ef5c89967d50042b29937fb724e057c1aa3c5207 diff --git a/trunk/drivers/net/macvlan.c b/trunk/drivers/net/macvlan.c index 021d9941c292..99eed9f37c84 100644 --- a/trunk/drivers/net/macvlan.c +++ b/trunk/drivers/net/macvlan.c @@ -359,6 +359,7 @@ static int macvlan_init(struct net_device *dev) (lowerdev->state & MACVLAN_STATE_MASK); dev->features = lowerdev->features & MACVLAN_FEATURES; dev->iflink = lowerdev->ifindex; + dev->hard_header_len = lowerdev->hard_header_len; macvlan_set_lockdep_class(dev);