aboutsummaryrefslogtreecommitdiffstats
path: root/net/sched/sch_htb.c
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2007-04-19 23:29:13 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-04-26 01:26:28 -0400
commit27a884dc3cb63b93c2b3b643f5b31eed5f8a4d26 (patch)
tree5a267e40f9b94014be38dad5de0a52b6628834e0 /net/sched/sch_htb.c
parentbe8bd86321fa7f06359d866ef61fb4d2f3e9dce9 (diff)
[SK_BUFF]: Convert skb->tail to sk_buff_data_t
So that it is also an offset from skb->head, reduces its size from 8 to 4 bytes on 64bit architectures, allowing us to combine the 4 bytes hole left by the layer headers conversion, reducing struct sk_buff size to 256 bytes, i.e. 4 64byte cachelines, and since the sk_buff slab cache is SLAB_HWCACHE_ALIGN... :-) Many calculations that previously required that skb->{transport,network, mac}_header be first converted to a pointer now can be done directly, being meaningful as offsets or pointers. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/sch_htb.c')
-rw-r--r--net/sched/sch_htb.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c
index f76c20c0a109..c687388a8cb6 100644
--- a/net/sched/sch_htb.c
+++ b/net/sched/sch_htb.c
@@ -1110,7 +1110,7 @@ static int htb_init(struct Qdisc *sch, struct rtattr *opt)
1110static int htb_dump(struct Qdisc *sch, struct sk_buff *skb) 1110static int htb_dump(struct Qdisc *sch, struct sk_buff *skb)
1111{ 1111{
1112 struct htb_sched *q = qdisc_priv(sch); 1112 struct htb_sched *q = qdisc_priv(sch);
1113 unsigned char *b = skb->tail; 1113 unsigned char *b = skb_tail_pointer(skb);
1114 struct rtattr *rta; 1114 struct rtattr *rta;
1115 struct tc_htb_glob gopt; 1115 struct tc_htb_glob gopt;
1116 spin_lock_bh(&sch->dev->queue_lock); 1116 spin_lock_bh(&sch->dev->queue_lock);
@@ -1123,12 +1123,12 @@ static int htb_dump(struct Qdisc *sch, struct sk_buff *skb)
1123 rta = (struct rtattr *)b; 1123 rta = (struct rtattr *)b;
1124 RTA_PUT(skb, TCA_OPTIONS, 0, NULL); 1124 RTA_PUT(skb, TCA_OPTIONS, 0, NULL);
1125 RTA_PUT(skb, TCA_HTB_INIT, sizeof(gopt), &gopt); 1125 RTA_PUT(skb, TCA_HTB_INIT, sizeof(gopt), &gopt);
1126 rta->rta_len = skb->tail - b; 1126 rta->rta_len = skb_tail_pointer(skb) - b;
1127 spin_unlock_bh(&sch->dev->queue_lock); 1127 spin_unlock_bh(&sch->dev->queue_lock);
1128 return skb->len; 1128 return skb->len;
1129rtattr_failure: 1129rtattr_failure:
1130 spin_unlock_bh(&sch->dev->queue_lock); 1130 spin_unlock_bh(&sch->dev->queue_lock);
1131 skb_trim(skb, skb->tail - skb->data); 1131 skb_trim(skb, skb_tail_pointer(skb) - skb->data);
1132 return -1; 1132 return -1;
1133} 1133}
1134 1134
@@ -1136,7 +1136,7 @@ static int htb_dump_class(struct Qdisc *sch, unsigned long arg,
1136 struct sk_buff *skb, struct tcmsg *tcm) 1136 struct sk_buff *skb, struct tcmsg *tcm)
1137{ 1137{
1138 struct htb_class *cl = (struct htb_class *)arg; 1138 struct htb_class *cl = (struct htb_class *)arg;
1139 unsigned char *b = skb->tail; 1139 unsigned char *b = skb_tail_pointer(skb);
1140 struct rtattr *rta; 1140 struct rtattr *rta;
1141 struct tc_htb_opt opt; 1141 struct tc_htb_opt opt;
1142 1142
@@ -1159,7 +1159,7 @@ static int htb_dump_class(struct Qdisc *sch, unsigned long arg,
1159 opt.prio = cl->un.leaf.prio; 1159 opt.prio = cl->un.leaf.prio;
1160 opt.level = cl->level; 1160 opt.level = cl->level;
1161 RTA_PUT(skb, TCA_HTB_PARMS, sizeof(opt), &opt); 1161 RTA_PUT(skb, TCA_HTB_PARMS, sizeof(opt), &opt);
1162 rta->rta_len = skb->tail - b; 1162 rta->rta_len = skb_tail_pointer(skb) - b;
1163 spin_unlock_bh(&sch->dev->queue_lock); 1163 spin_unlock_bh(&sch->dev->queue_lock);
1164 return skb->len; 1164 return skb->len;
1165rtattr_failure: 1165rtattr_failure: