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

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

net: Allow netdevices to specify needed head/tailroom 



This patch adds needed_headroom/needed_tailroom members to struct
net_device and updates many places that allocate sbks to use them. Not
all of them can be converted though, and I'm sure I missed some (I
mostly grepped for LL_RESERVED_SPACE)

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

include/linux/netdevice.h

+14 −2
Original line number Diff line number Diff line
@@ -246,11 +246,16 @@ struct hh_cache 
 *

 * We could use other alignment values, but we must maintain the

 * relationship HH alignment <= LL alignment.

 *

 * LL_ALLOCATED_SPACE also takes into account the tailroom the device

 * may need.

 */

#define LL_RESERVED_SPACE(dev) \

	(((dev)->hard_header_len&~(HH_DATA_MOD - 1)) + HH_DATA_MOD)

	((((dev)->hard_header_len+(dev)->needed_headroom)&~(HH_DATA_MOD - 1)) + HH_DATA_MOD)

#define LL_RESERVED_SPACE_EXTRA(dev,extra) \

	((((dev)->hard_header_len+extra)&~(HH_DATA_MOD - 1)) + HH_DATA_MOD)

	((((dev)->hard_header_len+(dev)->needed_headroom+(extra))&~(HH_DATA_MOD - 1)) + HH_DATA_MOD)

#define LL_ALLOCATED_SPACE(dev) \

	((((dev)->hard_header_len+(dev)->needed_headroom+(dev)->needed_tailroom)&~(HH_DATA_MOD - 1)) + HH_DATA_MOD)



struct header_ops {

	int	(*create) (struct sk_buff *skb, struct net_device *dev,
@@ -569,6 +574,13 @@ struct net_device 
	unsigned short		type;	/* interface hardware type	*/

	unsigned short		hard_header_len;	/* hardware hdr length	*/



	/* extra head- and tailroom the hardware may need, but not in all cases

	 * can this be guaranteed, especially tailroom. Some cases also use

	 * LL_MAX_HEADER instead to allocate the skb.

	 */

	unsigned short		needed_headroom;

	unsigned short		needed_tailroom;



	struct net_device	*master; /* Pointer to master device of a group,

					  * which this device is member of.

					  */

net/core/netpoll.c

+1 −1
Original line number Diff line number Diff line
@@ -419,7 +419,7 @@ static void arp_reply(struct sk_buff *skb) 
		return;



	size = arp_hdr_len(skb->dev);

	send_skb = find_skb(np, size + LL_RESERVED_SPACE(np->dev),

	send_skb = find_skb(np, size + LL_ALLOCATED_SPACE(np->dev),

			    LL_RESERVED_SPACE(np->dev));



	if (!send_skb)

net/econet/af_econet.c

+1 −1
Original line number Diff line number Diff line
@@ -340,7 +340,7 @@ static int econet_sendmsg(struct kiocb *iocb, struct socket *sock, 


		dev_hold(dev);



		skb = sock_alloc_send_skb(sk, len+LL_RESERVED_SPACE(dev),

		skb = sock_alloc_send_skb(sk, len+LL_ALLOCATED_SPACE(dev),

					  msg->msg_flags & MSG_DONTWAIT, &err);

		if (skb==NULL)

			goto out_unlock;

net/ipv4/arp.c

+1 −1
Original line number Diff line number Diff line
@@ -570,7 +570,7 @@ struct sk_buff *arp_create(int type, int ptype, __be32 dest_ip, 
	 *	Allocate a buffer

	 */



	skb = alloc_skb(arp_hdr_len(dev) + LL_RESERVED_SPACE(dev), GFP_ATOMIC);

	skb = alloc_skb(arp_hdr_len(dev) + LL_ALLOCATED_SPACE(dev), GFP_ATOMIC);

	if (skb == NULL)

		return NULL;

net/ipv4/igmp.c

+2 −2
Original line number Diff line number Diff line
@@ -292,7 +292,7 @@ static struct sk_buff *igmpv3_newpack(struct net_device *dev, int size) 
	struct iphdr *pip;

	struct igmpv3_report *pig;



	skb = alloc_skb(size + LL_RESERVED_SPACE(dev), GFP_ATOMIC);

	skb = alloc_skb(size + LL_ALLOCATED_SPACE(dev), GFP_ATOMIC);

	if (skb == NULL)

		return NULL;
@@ -653,7 +653,7 @@ static int igmp_send_report(struct in_device *in_dev, struct ip_mc_list *pmc, 
		return -1;

	}



	skb=alloc_skb(IGMP_SIZE+LL_RESERVED_SPACE(dev), GFP_ATOMIC);

	skb=alloc_skb(IGMP_SIZE+LL_ALLOCATED_SPACE(dev), GFP_ATOMIC);

	if (skb == NULL) {

		ip_rt_put(rt);

		return -1;