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

Commit 5ba0eac6 authored by Jiri Benc's avatar Jiri Benc Committed by David S. Miller
Browse files

[NET]: Fix HH_DATA_OFF. 



When the hardware header size is a multiple of HH_DATA_MOD, HH_DATA_OFF()
incorrectly returns HH_DATA_MOD (instead of 0). This affects ieee80211 layer
as 802.11 header is 32 bytes long.

Signed-off-by: default avatarJiri Benc <jbenc@suse.cz>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b597ef47

include/linux/netdevice.h

+1 −1
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ struct hh_cache 
	/* cached hardware header; allow for machine alignment needs.        */

#define HH_DATA_MOD	16

#define HH_DATA_OFF(__len) \

	(HH_DATA_MOD - ((__len) & (HH_DATA_MOD - 1)))

	(HH_DATA_MOD - (((__len - 1) & (HH_DATA_MOD - 1)) + 1))

#define HH_DATA_ALIGN(__len) \

	(((__len)+(HH_DATA_MOD-1))&~(HH_DATA_MOD - 1))

	unsigned long	hh_data[HH_DATA_ALIGN(LL_MAX_HEADER) / sizeof(long)];