mirror of
https://github.com/torvalds/linux.git
synced 2026-09-23 06:23:51 -04:00
[SK_BUFF]: Introduce skb_reset_network_header(skb)
For the common, open coded 'skb->nh.raw = skb->data' operation, so that we can later turn skb->nh.raw into a offset, reducing the size of struct sk_buff in 64bit land while possibly keeping it as a pointer on 32bit. This one touches just the most simple case, next will handle the slightly more "complex" cases. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
committed by
David S. Miller
parent
57effc70a5
commit
c1d2bbe1cd
@@ -1074,7 +1074,7 @@ static void dev_queue_xmit_nit(struct sk_buff *skb, struct net_device *dev)
|
||||
printk(KERN_CRIT "protocol %04x is "
|
||||
"buggy, dev %s\n",
|
||||
skb2->protocol, dev->name);
|
||||
skb2->nh.raw = skb2->data;
|
||||
skb_reset_network_header(skb2);
|
||||
}
|
||||
|
||||
skb2->h.raw = skb2->nh.raw;
|
||||
@@ -1771,7 +1771,8 @@ int netif_receive_skb(struct sk_buff *skb)
|
||||
|
||||
__get_cpu_var(netdev_rx_stat).total++;
|
||||
|
||||
skb->h.raw = skb->nh.raw = skb->data;
|
||||
skb_reset_network_header(skb);
|
||||
skb->h.raw = skb->data;
|
||||
skb->mac_len = skb->nh.raw - skb->mac.raw;
|
||||
|
||||
pt_prev = NULL;
|
||||
|
||||
@@ -359,7 +359,8 @@ static void arp_reply(struct sk_buff *skb)
|
||||
(2 * sizeof(u32)))))
|
||||
return;
|
||||
|
||||
skb->h.raw = skb->nh.raw = skb->data;
|
||||
skb_reset_network_header(skb);
|
||||
skb->h.raw = skb->data;
|
||||
arp = skb->nh.arph;
|
||||
|
||||
if ((arp->ar_hrd != htons(ARPHRD_ETHER) &&
|
||||
@@ -389,7 +390,7 @@ static void arp_reply(struct sk_buff *skb)
|
||||
if (!send_skb)
|
||||
return;
|
||||
|
||||
send_skb->nh.raw = send_skb->data;
|
||||
skb_reset_network_header(send_skb);
|
||||
arp = (struct arphdr *) skb_put(send_skb, size);
|
||||
send_skb->dev = skb->dev;
|
||||
send_skb->protocol = htons(ETH_P_ARP);
|
||||
|
||||
Reference in New Issue
Block a user