mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Herbert Xu <herbert@gondor.apana.org.au>
To: David Miller <davem@davemloft.net>
Cc: benjamin.thery@bull.net, pierre.peiffer@bull.net,
	akpm@linux-foundation.org, linux-kernel@vger.kernel.org,
	netdev@vger.kernel.org
Subject: Re: 2.6.24-rc5-mm1
Date: Fri, 14 Dec 2007 10:08:07 +0800	[thread overview]
Message-ID: <20071214020807.GA12426@gondor.apana.org.au> (raw)
In-Reply-To: <20071213.094554.136920553.davem@davemloft.net>

On Thu, Dec 13, 2007 at 09:45:54AM -0800, David Miller wrote:
> From: Benjamin Thery <benjamin.thery@bull.net>
> Date: Thu, 13 Dec 2007 16:01:34 +0100
> 
> > The problem comes from the new macro UDPX_INC_STATS_BH introduced
> > by Herbert, which was a nice addition to increment the correct 
> > UDP MIB depending on the socket family, but unfortunately 
> > the use of this macro from kernel code (I mean code not compiled 
> > as module) requires that IPv6 is also compiled in kernel 
> > (CONFIG_IPv6=y) in order to have udp_stats_in6 defined at link 
> > time.
> 
> Herbert, please take a look at this, thanks!

OK, let's just move udp_stats_in6 into net/ipv4/udp.c.  It's only
40 bytes or less.

[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 <herbert@gondor.apana.org.au>

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;
 EXPORT_SYMBOL(udp_statistics);
 
+DEFINE_SNMP_STAT(struct udp_mib, udp_stats_in6) __read_mostly;
+EXPORT_SYMBOL(udp_stats_in6);
+
 struct hlist_head udp_hash[UDP_HTABLE_SIZE];
 DEFINE_RWLOCK(udp_hash_lock);
 
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index 8cbdcc9..7db5a9d 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;
-EXPORT_SYMBOL(udp_stats_in6);
-
 static inline int udp_v6_get_port(struct sock *sk, unsigned short snum)
 {
 	return udp_get_port(sk, snum, ipv6_rcv_saddr_equal);

Cheers,
-- 
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

  reply	other threads:[~2007-12-14  2:08 UTC|newest]

Thread overview: 76+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-12-13 10:40 2.6.24-rc5-mm1 Andrew Morton
2007-12-13 11:59 ` 2.6.24-rc5-mm1 kobject changes broken with hvcs driver on powerpc - regression Kamalesh Babulal
2007-12-13 16:22   ` Greg KH
2007-12-13 12:28 ` 2.6.24-rc5-mm1 Gautham R Shenoy
2007-12-13 21:15   ` 2.6.24-rc5-mm1 Andrew Morton
2007-12-14  9:49   ` 2.6.24-rc5-mm1 Andrew Morton
2007-12-14 13:15     ` 2.6.24-rc5-mm1 Gregory Haskins
2007-12-13 14:18 ` 2.6.24-rc5-mm1 Pierre Peiffer
2007-12-13 15:01   ` 2.6.24-rc5-mm1 Benjamin Thery
2007-12-13 16:07     ` 2.6.24-rc5-mm1 Borislav Petkov
2007-12-13 17:54       ` 2.6.24-rc5-mm1 Adrian Bunk
2007-12-13 17:45     ` 2.6.24-rc5-mm1 David Miller
2007-12-14  2:08       ` Herbert Xu [this message]
2007-12-14 19:26         ` 2.6.24-rc5-mm1 David Miller
2007-12-13 14:56 ` 2.6.24-rc5-mm1 regression - kernel warning on tcp_fastretrans_alert() Kamalesh Babulal
2007-12-13 19:55   ` Andrew Morton
2007-12-13 15:16 ` 2.6.24-rc5-mm1 - build failures due to kobject changes Kamalesh Babulal
2007-12-13 16:21   ` Greg KH
2007-12-13 17:46 ` (was Re: 2.6.24-rc5-mm1) crypto/authenc.c select symbol in Kconfig Borislav Petkov
2007-12-14  8:53   ` Herbert Xu
2007-12-14  5:32 ` 2.6.24-rc5-mm1 Dave Young
2007-12-14 15:44   ` 2.6.24-rc5-mm1 Alan Stern
2007-12-17  1:14     ` 2.6.24-rc5-mm1 Dave Young
2007-12-19  7:49       ` 2.6.24-rc5-mm1 Dave Young
2007-12-19 16:07         ` 2.6.24-rc5-mm1 Alan Stern
2007-12-20  0:43           ` 2.6.24-rc5-mm1 Dave Young
2007-12-20  3:34             ` 2.6.24-rc5-mm1 Alan Stern
2007-12-20  4:32               ` 2.6.24-rc5-mm1 Dave Young
2007-12-14 14:08 ` 2.6.24-rc5-mm1 Dhaval Giani
2007-12-15 19:20 ` 2.6.24-rc5-mm1 Alexey Dobriyan
2007-12-16  9:10   ` 2.6.24-rc5-mm1 Andrew Morton
2007-12-15 23:59 ` broken suspend, sometimes (drm related) [Was: 2.6.24-rc5-mm1] Jiri Slaby
2007-12-17 16:55   ` Jesse Barnes
2007-12-16  0:18 ` 2.6.24-rc5-mm1: cat /proc/net/packet -> oops Mariusz Kozlowski
2007-12-16  3:07   ` Herbert Xu
2007-12-16  3:41     ` [PACKET]: Fix /proc/net/packet crash due to bogus private pointer Herbert Xu
2007-12-16 10:48       ` Mariusz Kozlowski
2007-12-16 22:04       ` David Miller
2007-12-16 10:11 ` 2.6.24-rc5-mm1: problems with cat /proc/kpageflags Mariusz Kozlowski
2007-12-16 10:14   ` Mariusz Kozlowski
2007-12-16 10:41     ` Mariusz Kozlowski
2007-12-16 11:40       ` Mariusz Kozlowski
2007-12-16 18:27         ` Matt Mackall
2007-12-16 18:48           ` Mariusz Kozlowski
2007-12-16 19:10             ` Mariusz Kozlowski
2007-12-17  2:11               ` Matt Mackall
2007-12-17  4:26                 ` David Miller
2007-12-17  6:39                   ` Andrew Morton
2007-12-17 14:55                     ` Matt Mackall
2007-12-20 12:53                       ` David Miller
2007-12-20 17:45                         ` Matt Mackall
2007-12-20 19:47                           ` Mariusz Kozlowski
2007-12-21  0:17                             ` David Miller
2007-12-21  1:06                               ` Matt Mackall
2007-12-21  3:15                                 ` David Miller
2007-12-21 21:51                                 ` Mariusz Kozlowski
2007-12-22  5:00                                   ` Andrew Morton
2007-12-17 19:05                 ` Mariusz Kozlowski
2007-12-17 22:44 ` 2.6.24-rc5-mm1 - wonky disk cache and CDROM behavior Valdis.Kletnieks
2007-12-17 22:56   ` Andrew Morton
2007-12-18  2:07     ` Valdis.Kletnieks
2007-12-18  2:37       ` Dave Young
2007-12-18  2:52         ` Andrew Morton
2007-12-18  5:52         ` Valdis.Kletnieks
2007-12-19  1:22         ` David Howells
2007-12-19  1:33           ` Dave Young
2007-12-19  2:04           ` Andrew Morton
2007-12-19  3:30             ` Jeff Dike
2007-12-18  6:10 ` 2.6.24-rc5-mm1 - IPv6 throws section mismatches Valdis.Kletnieks
2007-12-18 15:12   ` Daniel Lezcano
2007-12-20 16:55 ` 2.6.24-rc5-mm1 Jason Wessel
2007-12-20 23:11   ` 2.6.24-rc5-mm1 Andrew Morton
2007-12-21 13:46     ` 2.6.24-rc5-mm1 Jason Wessel
2007-12-20 20:57 ` 2.6.24-rc5-mm1 - SCSI/blkdev probing hang Rik van Riel
2007-12-20 21:22   ` Andrew Morton
2007-12-24 15:12     ` Rik van Riel

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20071214020807.GA12426@gondor.apana.org.au \
    --to=herbert@gondor.apana.org.au \
    --cc=akpm@linux-foundation.org \
    --cc=benjamin.thery@bull.net \
    --cc=davem@davemloft.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=pierre.peiffer@bull.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®