diff options
| author | David S. Miller <davem@davemloft.net> | 2015-08-28 13:43:33 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-08-28 13:43:33 -0700 |
| commit | 8b72ca67fed39816b732b0cf53a1c7f2efc6400d (patch) | |
| tree | 0fba964637c2a4aa7faa7dd986401098c7ff0bf0 /net/batman-adv/soft-interface.c | |
| parent | 9723e6abc70a472c726d5d5ac6402a2d1bb10882 (diff) | |
| parent | ed29266347025a19ee689807b07d121f0a7441f1 (diff) | |
| download | linux-8b72ca67fed39816b732b0cf53a1c7f2efc6400d.tar.bz2 | |
Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
Antonio Quartulli says:
====================
Included changes:
- code beautification
- remove obsolete 'deleted' attribute for bat-gw node
- increase internal version number
- prevent potential access to netdev object after deregistration
- set needed_head/tail_room for batman virtual interface
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/batman-adv/soft-interface.c')
| -rw-r--r-- | net/batman-adv/soft-interface.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index d5c5ad93a611..ac4d08de5df4 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -947,8 +947,6 @@ static void batadv_softif_init_early(struct net_device *dev) * have not been initialized yet */ dev->mtu = ETH_DATA_LEN; - /* reserve more space in the skbuff for our header */ - dev->hard_header_len = batadv_max_header_len(); /* generate random address */ eth_hw_addr_random(dev); |