diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-04-25 15:58:38 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-04-25 15:58:38 -0400 |
| commit | ca1841de3a426de8cfac6ca61f0f54e6283d0653 (patch) | |
| tree | fc9ca7db1f9ada5301b3684ae75cfe8470071425 /net/8021q/vlan_dev.c | |
| parent | c5325bf1df96152c969b44cae2b8131be5621c47 (diff) | |
| parent | 8fd62c82872a5a721c9fb0071ca0f7a49c1732e4 (diff) | |
Merge commit 'v2.6.38.4' into linaro-2.6.38
Diffstat (limited to 'net/8021q/vlan_dev.c')
| -rw-r--r-- | net/8021q/vlan_dev.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index be737539f34..ed68d0722e5 100644 --- a/net/8021q/vlan_dev.c +++ b/net/8021q/vlan_dev.c @@ -707,6 +707,7 @@ static int vlan_dev_init(struct net_device *dev) dev->fcoe_ddp_xid = real_dev->fcoe_ddp_xid; #endif + dev->needed_headroom = real_dev->needed_headroom; if (real_dev->features & NETIF_F_HW_VLAN_TX) { dev->header_ops = real_dev->header_ops; dev->hard_header_len = real_dev->hard_header_len; |