2008-01-30 20:09:01

by Adrian Bunk

Subject: [2.6 patch] make struct ipv4_devconf static

struct ipv4_devconf can now become static.

Signed-off-by: Adrian Bunk <[email protected]>

---

include/linux/inetdevice.h | 2 --
net/ipv4/devinet.c | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)

20262a3317069b1bdbf2b37f4002fa5322445914
diff --git a/include/linux/inetdevice.h b/include/linux/inetdevice.h
index 8d9eaae..fc4e3db 100644
--- a/include/linux/inetdevice.h
+++ b/include/linux/inetdevice.h
@@ -17,8 +17,6 @@ struct ipv4_devconf
DECLARE_BITMAP(state, __NET_IPV4_CONF_MAX - 1);
};

-extern struct ipv4_devconf ipv4_devconf;
-
struct in_device
{
struct net_device *dev;
diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
index 21f71bf..5ab5acc 100644
--- a/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c
@@ -64,7 +64,7 @@
#include <net/rtnetlink.h>
#include <net/net_namespace.h>

-struct ipv4_devconf ipv4_devconf = {
+static struct ipv4_devconf ipv4_devconf = {
.data = {
[NET_IPV4_CONF_ACCEPT_REDIRECTS - 1] = 1,
[NET_IPV4_CONF_SEND_REDIRECTS - 1] = 1,

2008-01-31 10:38:05

by Pavel Emelyanov

Subject: Re: [2.6 patch] make struct ipv4_devconf static

Adrian Bunk wrote:
> struct ipv4_devconf can now become static.
>
> Signed-off-by: Adrian Bunk <[email protected]>

Acked-by: Pavel Emelyanov <[email protected]>

> ---
>
> include/linux/inetdevice.h | 2 --
> net/ipv4/devinet.c | 2 +-
> 2 files changed, 1 insertion(+), 3 deletions(-)
>
> 20262a3317069b1bdbf2b37f4002fa5322445914
> diff --git a/include/linux/inetdevice.h b/include/linux/inetdevice.h
> index 8d9eaae..fc4e3db 100644
> --- a/include/linux/inetdevice.h
> +++ b/include/linux/inetdevice.h
> @@ -17,8 +17,6 @@ struct ipv4_devconf
> DECLARE_BITMAP(state, __NET_IPV4_CONF_MAX - 1);
> };
>
> -extern struct ipv4_devconf ipv4_devconf;
> -
> struct in_device
> {
> struct net_device *dev;
> diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
> index 21f71bf..5ab5acc 100644
> --- a/net/ipv4/devinet.c
> +++ b/net/ipv4/devinet.c
> @@ -64,7 +64,7 @@
> #include <net/rtnetlink.h>
> #include <net/net_namespace.h>
>
> -struct ipv4_devconf ipv4_devconf = {
> +static struct ipv4_devconf ipv4_devconf = {
> .data = {
> [NET_IPV4_CONF_ACCEPT_REDIRECTS - 1] = 1,
> [NET_IPV4_CONF_SEND_REDIRECTS - 1] = 1,
>
>