AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

inet: toss struct net initialization around

Browse Source 
Some places, that deal with ICMP statistics already have where
to get a struct net from, but use it directly, without declaring
a separate variable on the stack.

Since I will need this net soon, I declare a struct net on the
stack and use it in the existing places in a separate patch not
to spoil the future ones.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Pavel Emelyanov 2008-07-14 23:01:40 -07:00 committed by David S. Miller
parent 0388b00426
commit fd54d716b1
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
net/dccp/ipv4.c
View File

@ -205,13 +205,14 @@ static void dccp_v4_err(struct sk_buff *skb, u32 info)
struct sock *sk; struct sock *sk;
__u64 seq; __u64 seq;
int err; int err;
struct net *net = dev_net(skb->dev);
if (skb->len < (iph->ihl << 2) + 8) { if (skb->len < (iph->ihl << 2) + 8) {
ICMP_INC_STATS_BH(ICMP_MIB_INERRORS); ICMP_INC_STATS_BH(ICMP_MIB_INERRORS);
return; return;
} }
sk = inet_lookup(dev_net(skb->dev), &dccp_hashinfo, sk = inet_lookup(net, &dccp_hashinfo,
iph->daddr, dh->dccph_dport, iph->daddr, dh->dccph_dport,
iph->saddr, dh->dccph_sport, inet_iif(skb)); iph->saddr, dh->dccph_sport, inet_iif(skb));
if (sk == NULL) { if (sk == NULL) {

4
net/ipv4/icmp.c
View File

@ -973,6 +973,7 @@ int icmp_rcv(struct sk_buff *skb)
{ {
struct icmphdr *icmph; struct icmphdr *icmph;
struct rtable *rt = skb->rtable; struct rtable *rt = skb->rtable;
struct net *net = dev_net(rt->u.dst.dev);
if (!xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb)) { if (!xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb)) {
int nh; int nh;
@ -1027,9 +1028,6 @@ int icmp_rcv(struct sk_buff *skb)
*/ */
if (rt->rt_flags & (RTCF_BROADCAST | RTCF_MULTICAST)) { if (rt->rt_flags & (RTCF_BROADCAST | RTCF_MULTICAST)) {
struct net *net;
net = dev_net(rt->u.dst.dev);
/* /*
* RFC 1122: 3.2.2.6 An ICMP_ECHO to broadcast MAY be * RFC 1122: 3.2.2.6 An ICMP_ECHO to broadcast MAY be
* silently ignored (we let user decide with a sysctl). * silently ignored (we let user decide with a sysctl).

3
net/ipv4/tcp_ipv4.c
View File

@ -343,13 +343,14 @@ void tcp_v4_err(struct sk_buff *skb, u32 info)
struct sock *sk; struct sock *sk;
__u32 seq; __u32 seq;
int err; int err;
struct net *net = dev_net(skb->dev);
if (skb->len < (iph->ihl << 2) + 8) { if (skb->len < (iph->ihl << 2) + 8) {
ICMP_INC_STATS_BH(ICMP_MIB_INERRORS); ICMP_INC_STATS_BH(ICMP_MIB_INERRORS);
return; return;
} }
sk = inet_lookup(dev_net(skb->dev), &tcp_hashinfo, iph->daddr, th->dest, sk = inet_lookup(net, &tcp_hashinfo, iph->daddr, th->dest,
iph->saddr, th->source, inet_iif(skb)); iph->saddr, th->source, inet_iif(skb));
if (!sk) { if (!sk) {
ICMP_INC_STATS_BH(ICMP_MIB_INERRORS); ICMP_INC_STATS_BH(ICMP_MIB_INERRORS);

3
net/ipv4/udp.c
View File

@ -354,8 +354,9 @@ void __udp4_lib_err(struct sk_buff *skb, u32 info, struct hlist_head udptable[])
struct sock *sk; struct sock *sk;
int harderr; int harderr;
int err; int err;
struct net *net = dev_net(skb->dev);
sk = __udp4_lib_lookup(dev_net(skb->dev), iph->daddr, uh->dest, sk = __udp4_lib_lookup(net, iph->daddr, uh->dest,
iph->saddr, uh->source, skb->dev->ifindex, udptable); iph->saddr, uh->source, skb->dev->ifindex, udptable);
if (sk == NULL) { if (sk == NULL) {
ICMP_INC_STATS_BH(ICMP_MIB_INERRORS); ICMP_INC_STATS_BH(ICMP_MIB_INERRORS);