GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-22 22:51:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[SK_BUFF]: Use skb_reset_network_header in skb_push cases

Browse source 
skb_push updates and returns skb->data, so we can just call
skb_reset_network_header after the call to skb_push.

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 20:46:21 -07:00 • committed by David S. Miller
parent c1d2bbe1cd
commit e2d1bca7e6
12 changed files with 34 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
net/core/netpoll.c
View file

@ -308,7 +308,9 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
if (udph->check == 0) if (udph->check == 0)
udph->check = CSUM_MANGLED_0; udph->check = CSUM_MANGLED_0;
skb->nh.iph = iph = (struct iphdr *)skb_push(skb, sizeof(*iph)); skb_push(skb, sizeof(*iph));
skb_reset_network_header(skb);
iph = skb->nh.iph;
/* iph->version = 4; iph->ihl = 5; */ /* iph->version = 4; iph->ihl = 5; */
put_unaligned(0x45, (unsigned char *)iph); put_unaligned(0x45, (unsigned char *)iph);

3
net/ipv4/ip_gre.c
View file

@ -828,7 +828,8 @@ static int ipgre_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)
} }
skb->h.raw = skb->nh.raw; skb->h.raw = skb->nh.raw;
skb->nh.raw = skb_push(skb, gre_hlen); skb_push(skb, gre_hlen);
skb_reset_network_header(skb);
memset(&(IPCB(skb)->opt), 0, sizeof(IPCB(skb)->opt)); memset(&(IPCB(skb)->opt), 0, sizeof(IPCB(skb)->opt));
IPCB(skb)->flags &= ~(IPSKB_XFRM_TUNNEL_SIZE | IPSKB_XFRM_TRANSFORMED | IPCB(skb)->flags &= ~(IPSKB_XFRM_TUNNEL_SIZE | IPSKB_XFRM_TRANSFORMED |
IPSKB_REROUTED); IPSKB_REROUTED);

3
net/ipv4/ip_output.c
View file

@ -503,7 +503,8 @@ int ip_fragment(struct sk_buff *skb, int (*output)(struct sk_buff*))
if (frag) { if (frag) {
frag->ip_summed = CHECKSUM_NONE; frag->ip_summed = CHECKSUM_NONE;
frag->h.raw = frag->data; frag->h.raw = frag->data;
frag->nh.raw = __skb_push(frag, hlen); __skb_push(frag, hlen);
skb_reset_network_header(frag);
memcpy(frag->nh.raw, iph, hlen); memcpy(frag->nh.raw, iph, hlen);
iph = frag->nh.iph; iph = frag->nh.iph;
iph->tot_len = htons(frag->len); iph->tot_len = htons(frag->len);

3
net/ipv4/ipip.c
View file

@ -619,7 +619,8 @@ static int ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)
} }
skb->h.raw = skb->nh.raw; skb->h.raw = skb->nh.raw;
skb->nh.raw = skb_push(skb, sizeof(struct iphdr)); skb_push(skb, sizeof(struct iphdr));
skb_reset_network_header(skb);
memset(&(IPCB(skb)->opt), 0, sizeof(IPCB(skb)->opt)); memset(&(IPCB(skb)->opt), 0, sizeof(IPCB(skb)->opt));
IPCB(skb)->flags &= ~(IPSKB_XFRM_TUNNEL_SIZE | IPSKB_XFRM_TRANSFORMED | IPCB(skb)->flags &= ~(IPSKB_XFRM_TUNNEL_SIZE | IPSKB_XFRM_TRANSFORMED |
IPSKB_REROUTED); IPSKB_REROUTED);

3
net/ipv4/ipmr.c
View file

@ -1593,7 +1593,8 @@ int ipmr_get_route(struct sk_buff *skb, struct rtmsg *rtm, int nowait)
return -ENOMEM; return -ENOMEM;
} }
skb2->nh.raw = skb_push(skb2, sizeof(struct iphdr)); skb_push(skb2, sizeof(struct iphdr));
skb_reset_network_header(skb2);
skb2->nh.iph->ihl = sizeof(struct iphdr)>>2; skb2->nh.iph->ihl = sizeof(struct iphdr)>>2;
skb2->nh.iph->saddr = rt->rt_src; skb2->nh.iph->saddr = rt->rt_src;
skb2->nh.iph->daddr = rt->rt_dst; skb2->nh.iph->daddr = rt->rt_dst;

3
net/ipv4/ipvs/ip_vs_xmit.c
View file

@ -385,7 +385,8 @@ ip_vs_tunnel_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
/* fix old IP header checksum */ /* fix old IP header checksum */
ip_send_check(old_iph); ip_send_check(old_iph);
skb->nh.raw = skb_push(skb, sizeof(struct iphdr)); skb_push(skb, sizeof(struct iphdr));
skb_reset_network_header(skb);
memset(&(IPCB(skb)->opt), 0, sizeof(IPCB(skb)->opt)); memset(&(IPCB(skb)->opt), 0, sizeof(IPCB(skb)->opt));
/* drop old route */ /* drop old route */

3
net/ipv4/xfrm4_mode_beet.c
View file

@ -40,7 +40,8 @@ static int xfrm4_beet_output(struct xfrm_state *x, struct sk_buff *skb)
if (unlikely(optlen)) if (unlikely(optlen))
hdrlen += IPV4_BEET_PHMAXLEN - (optlen & 4); hdrlen += IPV4_BEET_PHMAXLEN - (optlen & 4);
skb->nh.raw = skb_push(skb, x->props.header_len + hdrlen); skb_push(skb, x->props.header_len + hdrlen);
skb_reset_network_header(skb);
top_iph = skb->nh.iph; top_iph = skb->nh.iph;
skb->h.raw += sizeof(*iph) - hdrlen; skb->h.raw += sizeof(*iph) - hdrlen;

4
net/ipv4/xfrm4_mode_transport.c
View file

@ -32,7 +32,9 @@ static int xfrm4_transport_output(struct xfrm_state *x, struct sk_buff *skb)
ihl = iph->ihl * 4; ihl = iph->ihl * 4;
skb->h.raw += ihl; skb->h.raw += ihl;
skb->nh.raw = memmove(skb_push(skb, x->props.header_len), iph, ihl); skb_push(skb, x->props.header_len);
skb_reset_network_header(skb);
memmove(skb->nh.raw, iph, ihl);
return 0; return 0;
} }

3
net/ipv4/xfrm4_mode_tunnel.c
View file

@ -49,7 +49,8 @@ static int xfrm4_tunnel_output(struct xfrm_state *x, struct sk_buff *skb)
iph = skb->nh.iph; iph = skb->nh.iph;
skb->h.ipiph = iph; skb->h.ipiph = iph;
skb->nh.raw = skb_push(skb, x->props.header_len); skb_push(skb, x->props.header_len);
skb_reset_network_header(skb);
top_iph = skb->nh.iph; top_iph = skb->nh.iph;
top_iph->ihl = 5; top_iph->ihl = 5;

14
net/ipv6/ip6_output.c
View file

@ -191,7 +191,9 @@ int ip6_xmit(struct sock *sk, struct sk_buff *skb, struct flowi *fl,
ipv6_push_nfrag_opts(skb, opt, &proto, &first_hop); ipv6_push_nfrag_opts(skb, opt, &proto, &first_hop);
} }
hdr = skb->nh.ipv6h = (struct ipv6hdr*)skb_push(skb, sizeof(struct ipv6hdr)); skb_push(skb, sizeof(struct ipv6hdr));
skb_reset_network_header(skb);
hdr = skb->nh.ipv6h;
/* /*
* Fill in the IPv6 header * Fill in the IPv6 header
@ -626,7 +628,8 @@ static int ip6_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *))
__skb_pull(skb, hlen); __skb_pull(skb, hlen);
fh = (struct frag_hdr*)__skb_push(skb, sizeof(struct frag_hdr)); fh = (struct frag_hdr*)__skb_push(skb, sizeof(struct frag_hdr));
skb->nh.raw = __skb_push(skb, hlen); __skb_push(skb, hlen);
skb_reset_network_header(skb);
memcpy(skb->nh.raw, tmp_hdr, hlen); memcpy(skb->nh.raw, tmp_hdr, hlen);
ipv6_select_ident(skb, fh); ipv6_select_ident(skb, fh);
@ -649,7 +652,8 @@ static int ip6_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *))
frag->ip_summed = CHECKSUM_NONE; frag->ip_summed = CHECKSUM_NONE;
frag->h.raw = frag->data; frag->h.raw = frag->data;
fh = (struct frag_hdr*)__skb_push(frag, sizeof(struct frag_hdr)); fh = (struct frag_hdr*)__skb_push(frag, sizeof(struct frag_hdr));
frag->nh.raw = __skb_push(frag, hlen); __skb_push(frag, hlen);
skb_reset_network_header(frag);
memcpy(frag->nh.raw, tmp_hdr, hlen); memcpy(frag->nh.raw, tmp_hdr, hlen);
offset += skb->len - hlen - sizeof(struct frag_hdr); offset += skb->len - hlen - sizeof(struct frag_hdr);
fh->nexthdr = nexthdr; fh->nexthdr = nexthdr;
@ -1346,7 +1350,9 @@ int ip6_push_pending_frames(struct sock *sk)
if (opt && opt->opt_nflen) if (opt && opt->opt_nflen)
ipv6_push_nfrag_opts(skb, opt, &proto, &final_dst); ipv6_push_nfrag_opts(skb, opt, &proto, &final_dst);
skb->nh.ipv6h = hdr = (struct ipv6hdr*) skb_push(skb, sizeof(struct ipv6hdr)); skb_push(skb, sizeof(struct ipv6hdr));
skb_reset_network_header(skb);
hdr = skb->nh.ipv6h;
*(__be32*)hdr = fl->fl6_flowlabel | *(__be32*)hdr = fl->fl6_flowlabel |
htonl(0x60000000 | ((int)np->cork.tclass << 20)); htonl(0x60000000 | ((int)np->cork.tclass << 20));

3
net/ipv6/ip6_tunnel.c
View file

@ -907,7 +907,8 @@ static int ip6_tnl_xmit2(struct sk_buff *skb,
init_tel_txopt(&opt, encap_limit); init_tel_txopt(&opt, encap_limit);
ipv6_push_nfrag_opts(skb, &opt.ops, &proto, NULL); ipv6_push_nfrag_opts(skb, &opt.ops, &proto, NULL);
} }
skb->nh.raw = skb_push(skb, sizeof(struct ipv6hdr)); skb_push(skb, sizeof(struct ipv6hdr));
skb_reset_network_header(skb);
ipv6h = skb->nh.ipv6h; ipv6h = skb->nh.ipv6h;
*(__be32*)ipv6h = fl->fl6_flowlabel | htonl(0x60000000); *(__be32*)ipv6h = fl->fl6_flowlabel | htonl(0x60000000);
dsfield = INET_ECN_encapsulate(0, dsfield); dsfield = INET_ECN_encapsulate(0, dsfield);

3
net/ipv6/sit.c
View file

@ -554,7 +554,8 @@ static int ipip6_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)
} }
skb->h.raw = skb->nh.raw; skb->h.raw = skb->nh.raw;
skb->nh.raw = skb_push(skb, sizeof(struct iphdr)); skb_push(skb, sizeof(struct iphdr));
skb_reset_network_header(skb);
memset(&(IPCB(skb)->opt), 0, sizeof(IPCB(skb)->opt)); memset(&(IPCB(skb)->opt), 0, sizeof(IPCB(skb)->opt));
IPCB(skb)->flags = 0; IPCB(skb)->flags = 0;
dst_release(skb->dst); dst_release(skb->dst);