aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/s390/net/ctcmain.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 /drivers/s390/net/ctcmain.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 'drivers/s390/net/ctcmain.c')
-rw-r--r--drivers/s390/net/ctcmain.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/s390/net/ctcmain.c b/drivers/s390/net/ctcmain.c
index 787c01317042..54e3f806cd52 100644
--- a/drivers/s390/net/ctcmain.c
+++ b/drivers/s390/net/ctcmain.c
@@ -706,7 +706,8 @@ ch_action_txdone(fsm_instance * fi, int event, void *arg)
706 spin_unlock(&ch->collect_lock); 706 spin_unlock(&ch->collect_lock);
707 return; 707 return;
708 } 708 }
709 ch->trans_skb->tail = ch->trans_skb->data = ch->trans_skb_data; 709 ch->trans_skb->data = ch->trans_skb_data;
710 skb_reset_tail_pointer(ch->trans_skb);
710 ch->trans_skb->len = 0; 711 ch->trans_skb->len = 0;
711 if (ch->prof.maxmulti < (ch->collect_len + 2)) 712 if (ch->prof.maxmulti < (ch->collect_len + 2))
712 ch->prof.maxmulti = ch->collect_len + 2; 713 ch->prof.maxmulti = ch->collect_len + 2;
@@ -831,7 +832,8 @@ ch_action_rx(fsm_instance * fi, int event, void *arg)
831 ctc_unpack_skb(ch, skb); 832 ctc_unpack_skb(ch, skb);
832 } 833 }
833 again: 834 again:
834 skb->data = skb->tail = ch->trans_skb_data; 835 skb->data = ch->trans_skb_data;
836 skb_reset_tail_pointer(skb);
835 skb->len = 0; 837 skb->len = 0;
836 if (ctc_checkalloc_buffer(ch, 1)) 838 if (ctc_checkalloc_buffer(ch, 1))
837 return; 839 return;
@@ -2226,7 +2228,8 @@ transmit_skb(struct channel *ch, struct sk_buff *skb)
2226 * IDAL support in CTC is broken, so we have to 2228 * IDAL support in CTC is broken, so we have to
2227 * care about skb's above 2G ourselves. 2229 * care about skb's above 2G ourselves.
2228 */ 2230 */
2229 hi = ((unsigned long) skb->tail + LL_HEADER_LENGTH) >> 31; 2231 hi = ((unsigned long)skb_tail_pointer(skb) +
2232 LL_HEADER_LENGTH) >> 31;
2230 if (hi) { 2233 if (hi) {
2231 nskb = alloc_skb(skb->len, GFP_ATOMIC | GFP_DMA); 2234 nskb = alloc_skb(skb->len, GFP_ATOMIC | GFP_DMA);
2232 if (!nskb) { 2235 if (!nskb) {
@@ -2262,7 +2265,7 @@ transmit_skb(struct channel *ch, struct sk_buff *skb)
2262 return -EBUSY; 2265 return -EBUSY;
2263 } 2266 }
2264 2267
2265 ch->trans_skb->tail = ch->trans_skb->data; 2268 skb_reset_tail_pointer(ch->trans_skb);
2266 ch->trans_skb->len = 0; 2269 ch->trans_skb->len = 0;
2267 ch->ccw[1].count = skb->len; 2270 ch->ccw[1].count = skb->len;
2268 memcpy(skb_put(ch->trans_skb, skb->len), skb->data, 2271 memcpy(skb_put(ch->trans_skb, skb->len), skb->data,