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

Commit f3994ece authored by Johannes Berg's avatar Johannes Berg Committed by David S. Miller
Browse files

mac80211: assign needed_headroom/tailroom for netdevs 



This assigns the netdev's needed_headroom/tailroom members to take
advantage of pre-allocated space for 802.11 headers.

Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f5184d26

net/mac80211/iface.c

+9 −0
Original line number Original line Diff line number Diff line
@@ -54,6 +54,15 @@ int ieee80211_if_add(struct net_device *dev, const char *name, 
	if (!ndev)

	if (!ndev)

		return -ENOMEM;

		return -ENOMEM;





	ndev->needed_headroom = local->tx_headroom +

				4*6 /* four MAC addresses */

				+ 2 + 2 + 2 + 2 /* ctl, dur, seq, qos */

				+ 6 /* mesh */

				+ 8 /* rfc1042/bridge tunnel */

				- ETH_HLEN /* ethernet hard_header_len */

				+ IEEE80211_ENCRYPT_HEADROOM;

	ndev->needed_tailroom = IEEE80211_ENCRYPT_TAILROOM;



	ret = dev_alloc_name(ndev, ndev->name);

	ret = dev_alloc_name(ndev, ndev->name);

	if (ret < 0)

	if (ret < 0)

		goto fail;

		goto fail;