From 7f155e2d8430f524c7a80529ed542cbf9d553343 Mon Sep 17 00:00:00 2001 From: Herbert Xu Date: Fri, 18 Nov 2011 02:20:05 +0000 Subject: [PATCH] --- yaml --- r: 277900 b: refs/heads/master c: 56c978f1da1f630ef18aa668a9748c6c23ab819b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/netdevice.h | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 93b0a4300c7d..14dbc5991b26 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ae641949df01b85117845bec45328eab6d6fada1 +refs/heads/master: 56c978f1da1f630ef18aa668a9748c6c23ab819b diff --git a/trunk/include/linux/netdevice.h b/trunk/include/linux/netdevice.h index 0bbe030fc014..3eb383a9b5ed 100644 --- a/trunk/include/linux/netdevice.h +++ b/trunk/include/linux/netdevice.h @@ -279,16 +279,11 @@ 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+(dev)->needed_headroom)&~(HH_DATA_MOD - 1)) + HH_DATA_MOD) #define LL_RESERVED_SPACE_EXTRA(dev,extra) \ ((((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,