Commit:     9055e051b8d4b266054fe511a65a9888d30fa64f
Parent:     8d614434ab77b440b69e66a9bd44e46e7194c34a
Author:     Herbert Xu <[EMAIL PROTECTED]>
AuthorDate: Fri Dec 14 11:25:26 2007 -0800
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Mon Jan 28 14:58:06 2008 -0800

    [UDP]: Move udp_stats_in6 into net/ipv4/udp.c
    Now that external users may increment the counters directly, we need
    to ensure that udp_stats_in6 is always available.  Otherwise we'd
    either have to requrie the external users to be built as modules or
    ipv6 to be built-in.
    This isn't too bad because udp_stats_in6 is just a pair of pointers
    plus an EXPORT, e.g., just 40 (16 + 24) bytes on x86-64.
    Signed-off-by: Herbert Xu <[EMAIL PROTECTED]>
    Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
 net/ipv4/udp.c |    3 +++
 net/ipv6/udp.c |    3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index 9ed6393..3d60215 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -112,6 +112,9 @@
 DEFINE_SNMP_STAT(struct udp_mib, udp_statistics) __read_mostly;
+DEFINE_SNMP_STAT(struct udp_mib, udp_stats_in6) __read_mostly;
 struct hlist_head udp_hash[UDP_HTABLE_SIZE];
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index 8b3e6d6..c9a97b4 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -51,9 +51,6 @@
 #include <linux/seq_file.h>
 #include "udp_impl.h"
-DEFINE_SNMP_STAT(struct udp_mib, udp_stats_in6) __read_mostly;
 static inline int udp_v6_get_port(struct sock *sk, unsigned short snum)
        return udp_get_port(sk, snum, ipv6_rcv_saddr_equal);
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to