=================================================================== ChangeSet@1.2042, 2004-10-05 16:11:14-03:00, acme@conectiva.com.br [SKBUFF] introduce skb_link_header_size(skb) Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller drivers/net/arcnet/arcnet.c | 8 ++++---- include/linux/skbuff.h | 5 +++++ net/core/dev.c | 2 +- net/ipv4/ip_gre.c | 3 ++- 4 files changed, 12 insertions(+), 6 deletions(-) diff -Nru a/drivers/net/arcnet/arcnet.c b/drivers/net/arcnet/arcnet.c --- a/drivers/net/arcnet/arcnet.c 2004-10-05 16:11:56 -03:00 +++ b/drivers/net/arcnet/arcnet.c 2004-10-05 16:11:56 -03:00 @@ -478,9 +478,9 @@ */ if (!daddr) { *(uint16_t *) skb_push(skb, 2) = type; - if (skb->nh.raw - skb->mac.raw != 2) + if (skb_link_header_size(skb) != 2) BUGMSG(D_NORMAL, "arcnet_header: Yikes! diff (%d) is not 2!\n", - (int)(skb->nh.raw - skb->mac.raw)); + skb_link_header_size(skb)); return -2; /* return error -- can't transmit yet! */ } /* otherwise, we can just add the header as usual. */ @@ -512,10 +512,10 @@ uint8_t daddr=0; struct ArcProto *proto; - if (skb->nh.raw - skb->mac.raw != 2) { + if (skb_link_header_size(skb) != 2) { BUGMSG(D_NORMAL, "rebuild_header: shouldn't be here! (hdrsize=%d)\n", - (int)(skb->nh.raw - skb->mac.raw)); + skb_link_header_size(skb)); return 0; } type = *(uint16_t *) skb_pull(skb, 2); diff -Nru a/include/linux/skbuff.h b/include/linux/skbuff.h --- a/include/linux/skbuff.h 2004-10-05 16:11:56 -03:00 +++ b/include/linux/skbuff.h 2004-10-05 16:11:56 -03:00 @@ -302,6 +302,11 @@ (skb->mac.raw + hdrlen) <= skb->data; } +static inline int skb_link_header_size(const struct sk_buff *skb) +{ + return skb->nh.raw - skb->mac.raw; +} + extern void __kfree_skb(struct sk_buff *skb); extern struct sk_buff *alloc_skb(unsigned int size, int priority); extern void kfree_skbmem(struct sk_buff *skb); diff -Nru a/net/core/dev.c b/net/core/dev.c --- a/net/core/dev.c 2004-10-05 16:11:56 -03:00 +++ b/net/core/dev.c 2004-10-05 16:11:56 -03:00 @@ -1735,7 +1735,7 @@ __get_cpu_var(netdev_rx_stat).total++; skb->h.raw = skb->nh.raw = skb->data; - skb->mac_len = skb->nh.raw - skb->mac.raw; + skb->mac_len = skb_link_header_size(skb); pt_prev = NULL; diff -Nru a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c --- a/net/ipv4/ip_gre.c 2004-10-05 16:11:56 -03:00 +++ b/net/ipv4/ip_gre.c 2004-10-05 16:11:56 -03:00 @@ -621,7 +621,8 @@ memset(&(IPCB(skb)->opt), 0, sizeof(struct ip_options)); if (skb->ip_summed == CHECKSUM_HW) skb->csum = csum_sub(skb->csum, - csum_partial(skb->mac.raw, skb->nh.raw-skb->mac.raw, 0)); + csum_partial(skb->mac.raw, + skb_link_header_size(skb), 0)); skb->pkt_type = PACKET_HOST; #ifdef CONFIG_NET_IPGRE_BROADCAST if (MULTICAST(iph->daddr)) {