netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH][ROSE] Trivial compilation CONFIG_INET=n case
@ 2007-12-04 15:11 Pavel Emelyanov
  2007-12-05 10:17 ` David Miller
  0 siblings, 1 reply; 2+ messages in thread
From: Pavel Emelyanov @ 2007-12-04 15:11 UTC (permalink / raw)
  To: David Miller; +Cc: Ralf Baechle, linux-hams, Linux Netdev List, devel

The rose_rebuild_header() consists only of some variables in
case INET=n, and gcc will warn us about it.

Fits both net-2.6 and net-2.6.25.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>

---

diff --git a/net/rose/rose_dev.c b/net/rose/rose_dev.c
index 1b6741f..12cfcf0 100644
--- a/net/rose/rose_dev.c
+++ b/net/rose/rose_dev.c
@@ -55,13 +55,13 @@ static int rose_header(struct sk_buff *skb, struct net_device *dev,
 
 static int rose_rebuild_header(struct sk_buff *skb)
 {
+#ifdef CONFIG_INET
 	struct net_device *dev = skb->dev;
 	struct net_device_stats *stats = netdev_priv(dev);
 	unsigned char *bp = (unsigned char *)skb->data;
 	struct sk_buff *skbn;
 	unsigned int len;
 
-#ifdef CONFIG_INET
 	if (arp_find(bp + 7, skb)) {
 		return 1;
 	}
-- 
1.5.3.4


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH][ROSE] Trivial compilation CONFIG_INET=n case
  2007-12-04 15:11 [PATCH][ROSE] Trivial compilation CONFIG_INET=n case Pavel Emelyanov
@ 2007-12-05 10:17 ` David Miller
  0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2007-12-05 10:17 UTC (permalink / raw)
  To: xemul; +Cc: ralf, linux-hams, netdev, devel

From: Pavel Emelyanov <xemul@openvz.org>
Date: Tue, 04 Dec 2007 18:11:05 +0300

> The rose_rebuild_header() consists only of some variables in
> case INET=n, and gcc will warn us about it.
> 
> Fits both net-2.6 and net-2.6.25.
> 
> Signed-off-by: Pavel Emelyanov <xemul@openvz.org>

Applied to net-2.6, thanks.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2007-12-05 10:17 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-12-04 15:11 [PATCH][ROSE] Trivial compilation CONFIG_INET=n case Pavel Emelyanov
2007-12-05 10:17 ` David Miller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).