Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c12ec74 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'batman-adv-fix-for-davem' of git://git.open-mesh.org/linux-merge 



Included change:
- properly compute the batman-adv header overhead. Such
  result is later used to initialize the hard_header_len
  member of the soft-interface netdev object

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 38a529b5 1df0cbd5

net/batman-adv/main.c

+1 −1
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ int batadv_max_header_len(void) 
			   sizeof(struct batadv_coded_packet));

#endif



	return header_len;

	return header_len + ETH_HLEN;

}



/**