git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
net
/
ipv4
/
ip_output.c
diff --git
a/net/ipv4/ip_output.c
b/net/ipv4/ip_output.c
index
5a853aa
..
770eeee
100644
(file)
--- a/
net/ipv4/ip_output.c
+++ b/
net/ipv4/ip_output.c
@@
-233,7
+233,7
@@
int ip_mc_output(struct sk_buff **pskb)
/*
* If the indicated interface is up and running, send the packet.
*/
/*
* If the indicated interface is up and running, send the packet.
*/
- IP_INC_STATS(
IPSTATS_MIB_OUTREQUESTS
);
+ IP_INC_STATS(
OutRequests
);
skb->dev = dev;
skb->protocol = htons(ETH_P_IP);
skb->dev = dev;
skb->protocol = htons(ETH_P_IP);
@@
-288,7
+288,7
@@
int ip_output(struct sk_buff **pskb)
{
struct sk_buff *skb = *pskb;
{
struct sk_buff *skb = *pskb;
- IP_INC_STATS(
IPSTATS_MIB_OUTREQUESTS
);
+ IP_INC_STATS(
OutRequests
);
if ((skb->len > dst_pmtu(skb->dst) || skb_shinfo(skb)->frag_list) &&
!skb_shinfo(skb)->tso_size)
if ((skb->len > dst_pmtu(skb->dst) || skb_shinfo(skb)->frag_list) &&
!skb_shinfo(skb)->tso_size)
@@
-393,7
+393,7
@@
packet_routed:
dst_output);
no_route:
dst_output);
no_route:
- IP_INC_STATS(
IPSTATS_MIB_OUTNOROUTES
);
+ IP_INC_STATS(
OutNoRoutes
);
kfree_skb(skb);
return -EHOSTUNREACH;
}
kfree_skb(skb);
return -EHOSTUNREACH;
}
@@
-546,7
+546,7
@@
int ip_fragment(struct sk_buff *skb, int (*output)(struct sk_buff*))
}
if (err == 0) {
}
if (err == 0) {
- IP_INC_STATS(
IPSTATS_MIB_FRAGOKS
);
+ IP_INC_STATS(
FragOKs
);
return 0;
}
return 0;
}
@@
-555,7
+555,7
@@
int ip_fragment(struct sk_buff *skb, int (*output)(struct sk_buff*))
kfree_skb(frag);
frag = skb;
}
kfree_skb(frag);
frag = skb;
}
- IP_INC_STATS(
IPSTATS_MIB_FRAGFAILS
);
+ IP_INC_STATS(
FragFails
);
return err;
}
return err;
}
@@
-661,7
+661,7
@@
slow_path:
* Put this fragment into the sending queue.
*/
* Put this fragment into the sending queue.
*/
- IP_INC_STATS(
IPSTATS_MIB_FRAGCREATES
);
+ IP_INC_STATS(
FragCreates
);
iph->tot_len = htons(len + hlen);
iph->tot_len = htons(len + hlen);
@@
-672,12
+672,12
@@
slow_path:
goto fail;
}
kfree_skb(skb);
goto fail;
}
kfree_skb(skb);
- IP_INC_STATS(
IPSTATS_MIB_FRAGOKS
);
+ IP_INC_STATS(
FragOKs
);
return err;
fail:
kfree_skb(skb);
return err;
fail:
kfree_skb(skb);
- IP_INC_STATS(
IPSTATS_MIB_FRAGFAILS
);
+ IP_INC_STATS(
FragFails
);
return err;
}
return err;
}
@@
-963,7
+963,7
@@
alloc_new_skb:
error:
inet->cork.length -= length;
error:
inet->cork.length -= length;
- IP_INC_STATS(
IPSTATS_MIB_OUTDISCARDS
);
+ IP_INC_STATS(
OutDiscards
);
return err;
}
return err;
}
@@
-1076,7
+1076,7
@@
ssize_t ip_append_page(struct sock *sk, struct page *page,
error:
inet->cork.length -= size;
error:
inet->cork.length -= size;
- IP_INC_STATS(
IPSTATS_MIB_OUTDISCARDS
);
+ IP_INC_STATS(
OutDiscards
);
return err;
}
return err;
}
@@
-1184,7
+1184,7
@@
out:
return err;
error:
return err;
error:
- IP_INC_STATS(
IPSTATS_MIB_OUTDISCARDS
);
+ IP_INC_STATS(
OutDiscards
);
goto out;
}
goto out;
}