diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2011-11-17 21:20:05 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-11-18 14:37:09 -0500 |
commit | 56c978f1da1f630ef18aa668a9748c6c23ab819b (patch) | |
tree | 6215afe05067bed4dc95b165d813db29df34cde4 /include/linux/netdevice.h | |
parent | ae641949df01b85117845bec45328eab6d6fada1 (diff) |
net: Remove LL_ALLOCATED_SPACE
net: Remove LL_ALLOCATED_SPACE
The macro LL_ALLOCATED_SPACE was ill-conceived. It applies the
alignment to the sum of needed_headroom and needed_tailroom. As
the amount that is then reserved for head room is needed_headroom
with alignment, this means that the tail room left may be too small.
Now that all uses of LL_ALLOCATED_SPACE have been removed, this
patch finally removes the macro itself.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/netdevice.h')
-rw-r--r-- | include/linux/netdevice.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 0bbe030fc014..3eb383a9b5ed 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
@@ -279,16 +279,11 @@ struct hh_cache { | |||
279 | * | 279 | * |
280 | * We could use other alignment values, but we must maintain the | 280 | * We could use other alignment values, but we must maintain the |
281 | * relationship HH alignment <= LL alignment. | 281 | * relationship HH alignment <= LL alignment. |
282 | * | ||
283 | * LL_ALLOCATED_SPACE also takes into account the tailroom the device | ||
284 | * may need. | ||
285 | */ | 282 | */ |
286 | #define LL_RESERVED_SPACE(dev) \ | 283 | #define LL_RESERVED_SPACE(dev) \ |
287 | ((((dev)->hard_header_len+(dev)->needed_headroom)&~(HH_DATA_MOD - 1)) + HH_DATA_MOD) | 284 | ((((dev)->hard_header_len+(dev)->needed_headroom)&~(HH_DATA_MOD - 1)) + HH_DATA_MOD) |
288 | #define LL_RESERVED_SPACE_EXTRA(dev,extra) \ | 285 | #define LL_RESERVED_SPACE_EXTRA(dev,extra) \ |
289 | ((((dev)->hard_header_len+(dev)->needed_headroom+(extra))&~(HH_DATA_MOD - 1)) + HH_DATA_MOD) | 286 | ((((dev)->hard_header_len+(dev)->needed_headroom+(extra))&~(HH_DATA_MOD - 1)) + HH_DATA_MOD) |
290 | #define LL_ALLOCATED_SPACE(dev) \ | ||
291 | ((((dev)->hard_header_len+(dev)->needed_headroom+(dev)->needed_tailroom)&~(HH_DATA_MOD - 1)) + HH_DATA_MOD) | ||
292 | 287 | ||
293 | struct header_ops { | 288 | struct header_ops { |
294 | int (*create) (struct sk_buff *skb, struct net_device *dev, | 289 | int (*create) (struct sk_buff *skb, struct net_device *dev, |