diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2015-10-06 17:10:28 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-10-06 17:10:28 +0200 |
| commit | 82fc167c392a1700f9adbde639730ee8c8122474 (patch) | |
| tree | 373ab737a040dd21e5f98425e7c82a6cc4a83568 /drivers/net/arcnet/arcnet.c | |
| parent | atomic: Implement atomic_read_ctrl() (diff) | |
| parent | Linux 4.3-rc4 (diff) | |
| download | linux-dev-82fc167c392a1700f9adbde639730ee8c8122474.tar.xz linux-dev-82fc167c392a1700f9adbde639730ee8c8122474.zip | |
Merge tag 'v4.3-rc4' into locking/core, to pick up fixes before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net/arcnet/arcnet.c')
| -rw-r--r-- | drivers/net/arcnet/arcnet.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/arcnet/arcnet.c b/drivers/net/arcnet/arcnet.c index 10f71c732b59..816d0e94961c 100644 --- a/drivers/net/arcnet/arcnet.c +++ b/drivers/net/arcnet/arcnet.c @@ -326,7 +326,7 @@ static void arcdev_setup(struct net_device *dev) dev->type = ARPHRD_ARCNET; dev->netdev_ops = &arcnet_netdev_ops; dev->header_ops = &arcnet_header_ops; - dev->hard_header_len = sizeof(struct archdr); + dev->hard_header_len = sizeof(struct arc_hardware); dev->mtu = choose_mtu(); dev->addr_len = ARCNET_ALEN; |