[PATCH]: jme: Fix warnings with CONFIG_PM disabled.

[PATCH]: jme: Fix warnings with CONFIG_PM disabled.

[David Miller]

I just added the following warning fix to net-next-2.6

jme: Fix warnings with CONFIG_PM disabled.

drivers/net/jme.c:1598: warning: ‘jme_set_100m_half’ defined but not used
drivers/net/jme.c:1618: warning: ‘jme_wait_link’ defined but not used

Signed-off-by: David S. Miller <davem@davemloft.net>
---
 drivers/net/jme.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/drivers/net/jme.c b/drivers/net/jme.c
index 3ab2442..5f9a131 100644
--- a/drivers/net/jme.c
+++ b/drivers/net/jme.c
@@ -1593,6 +1593,7 @@ err_out:
 	return rc;
 }
 
+#ifdef CONFIG_PM
 static void
 jme_set_100m_half(struct jme_adapter *jme)
 {
@@ -1625,6 +1626,7 @@ jme_wait_link(struct jme_adapter *jme)
 		phylink = jme_linkstat_from_phy(jme);
 	}
 }
+#endif
 
 static inline void
 jme_phy_off(struct jme_adapter *jme)
@@ -2912,6 +2914,7 @@ jme_remove_one(struct pci_dev *pdev)
 
 }
 
+#ifdef CONFIG_PM
 static int
 jme_suspend(struct pci_dev *pdev, pm_message_t state)
 {
@@ -2991,6 +2994,7 @@ jme_resume(struct pci_dev *pdev)
 
 	return 0;
 }
+#endif
 
 static struct pci_device_id jme_pci_tbl[] = {
 	{ PCI_VDEVICE(JMICRON, PCI_DEVICE_ID_JMICRON_JMC250) },
-- 
1.5.6.5

Re: [PATCH]: jme: Fix warnings with CONFIG_PM disabled.

[Guo-Fu Tseng]

Got it, sorry for mistake.
Thank you for super fast applying the patches. 

--
Guo-Fu Tseng

[PATCH net-next-2.6] nf_conntrack_ecache.h: Fix missing braces

[Guo-Fu Tseng]

Hi David:

    This patch add missing braces of today's net-next-2.6:
    include/net/netfilter/nf_conntrack_ecache.h

    The patch is also available at:
    http://cooldavid.org/download/nf.net-next-2.6.20081010.patch

    Signed-off-by: Guo-Fu Tseng <cooldavid@cooldavid.org>

diff --git a/include/net/netfilter/nf_conntrack_ecache.h
b/include/net/netfilter/nf_conntrack_ecache.h
index 35f814c..11480e6 100644
--- a/include/net/netfilter/nf_conntrack_ecache.h
+++ b/include/net/netfilter/nf_conntrack_ecache.h
@@ -74,6 +74,7 @@ static inline void nf_ct_event_cache_flush(struct net *net) {}
 static inline int nf_conntrack_ecache_init(struct net *net)
 {
 	return 0;
+}
 
 static inline void nf_conntrack_ecache_fini(struct net *net)
 {

[PATCH net-next-2.6]: tcpv6: fix error with CONFIG_TCP_MD5SIG disabled

[Guo-Fu Tseng]

Hi David:

    This patch fix error with CONFIG_TCP_MD5SIG disabled.

    The patch is also available at:
    http://cooldavid.org/download/tcpv6.net-next-2.6.20081010.patch

    Signed-off-by: Guo-Fu Tseng <cooldavid@cooldavid.org>

diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 13c6514..e5310c9 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -1036,9 +1036,7 @@ static void tcp_v6_send_reset(struct sock *sk, struct
sk_buff *skb)
 {
 	struct tcphdr *th = tcp_hdr(skb);
 	u32 seq = 0, ack_seq = 0;
-#ifdef CONFIG_TCP_MD5SIG
-	struct tcp_md5sig_key *key;
-#endif
+	struct tcp_md5sig_key *key = NULL;
 
 	if (th->rst)
 		return;
@@ -1049,8 +1047,6 @@ static void tcp_v6_send_reset(struct sock *sk, struct
sk_buff *skb)
 #ifdef CONFIG_TCP_MD5SIG
 	if (sk)
 		key = tcp_v6_md5_do_lookup(sk, &ipv6_hdr(skb)->daddr);
-	else
-		key = NULL;
 #endif
 
 	if (th->ack)

Re: [PATCH net-next-2.6] nf_conntrack_ecache.h: Fix missing braces

[David Miller]

From: "Guo-Fu Tseng" <cooldavid@cooldavid.org>
Date: Fri, 10 Oct 2008 11:08:45 +0800

> Hi David:
> 
>     This patch add missing braces of today's net-next-2.6:
>     include/net/netfilter/nf_conntrack_ecache.h
> 
>     The patch is also available at:
>     http://cooldavid.org/download/nf.net-next-2.6.20081010.patch
> 
>     Signed-off-by: Guo-Fu Tseng <cooldavid@cooldavid.org>

Applied, thanks.

Re: [PATCH net-next-2.6]: tcpv6: fix error with CONFIG_TCP_MD5SIG disabled

[David Miller]

From: "Guo-Fu Tseng" <cooldavid@cooldavid.org>
Date: Fri, 10 Oct 2008 11:21:15 +0800

> Hi David:
> 
>     This patch fix error with CONFIG_TCP_MD5SIG disabled.
> 
>     The patch is also available at:
>     http://cooldavid.org/download/tcpv6.net-next-2.6.20081010.patch
> 
>     Signed-off-by: Guo-Fu Tseng <cooldavid@cooldavid.org>

Applied but I had to fix the corruption your email client made to
the patch.

I know you provide the patch via URL here, but that is totally
inconvenient for me and I will not go to a web site to get a
patch when it should be conveniently available directly in my
inbox.

Thanks.

Re: [PATCH net-next-2.6]: tcpv6: fix error with CONFIG_TCP_MD5SIG disabled

[Ilpo Järvinen]

On Fri, 10 Oct 2008, Guo-Fu Tseng wrote:

>     This patch fix error with CONFIG_TCP_MD5SIG disabled.

Thanks for the fix, I realized (just before falling a sleep) that this 
would happen after my changes...

-- 
 i.

Re: [PATCH net-next-2.6]: tcpv6: fix error with CONFIG_TCP_MD5SIG disabled

[Guo-Fu Tseng]

On Thu, 09 Oct 2008 21:12:46 -0700 (PDT), David Miller wrote
> From: "Guo-Fu Tseng" <cooldavid@cooldavid.org>
> Date: Fri, 10 Oct 2008 11:21:15 +0800
> 
> 
> Applied but I had to fix the corruption your email client made to
> the patch.
> 
> I know you provide the patch via URL here, but that is totally
> inconvenient for me and I will not go to a web site to get a
> patch when it should be conveniently available directly in my
> inbox.
> 
I noticed that too, I'll be more careful next time.
Sorry for the inconvenience.

Guo-Fu Tseng