lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[SK_BUFF]: unions of just one member don't get anything done, kill them

Browse Source 
Renaming skb->h to skb->transport_header, skb->nh to skb->network_header and
skb->mac to skb->mac_header, to match the names of the associated helpers
(skb[_[re]set]_{transport,network,mac}_header).

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Arnaldo Carvalho de Melo
2007-04-10 21:21:55 -07:00
committed by David S. Miller
parent cfe1fc7759
commit b0e380b1d8
46 changed files with 162 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
net/ipv4/ipmr.c
View File

@ -597,7 +597,7 @@ static int ipmr_cache_report(struct sk_buff *pkt, vifi_t vifi, int assert)
msg->im_msgtype = assert;
igmp->code = 0;
ip_hdr(skb)->tot_len = htons(skb->len); /* Fix the length */
skb->h.raw = skb->nh.raw;
skb->transport_header = skb->network_header;
}
if (mroute_socket == NULL) {
@ -1102,7 +1102,7 @@ static void ip_encap(struct sk_buff *skb, __be32 saddr, __be32 daddr)
struct iphdr *old_iph = ip_hdr(skb);
skb_push(skb, sizeof(struct iphdr));
skb->h.raw = skb->nh.raw;
skb->transport_header = skb->network_header;
skb_reset_network_header(skb);
iph = ip_hdr(skb);
@ -1461,7 +1461,7 @@ int pim_rcv_v1(struct sk_buff * skb)
if (reg_dev == NULL)
goto drop;
skb->mac.raw = skb->nh.raw;
skb->mac_header = skb->network_header;
skb_pull(skb, (u8*)encap - skb->data);
skb_reset_network_header(skb);
skb->dev = reg_dev;
@ -1517,7 +1517,7 @@ static int pim_rcv(struct sk_buff * skb)
if (reg_dev == NULL)
goto drop;
skb->mac.raw = skb->nh.raw;
skb->mac_header = skb->network_header;
skb_pull(skb, (u8*)encap - skb->data);
skb_reset_network_header(skb);
skb->dev = reg_dev;