OpenVZ Forum


Home » Mailing lists » Devel » [PATCH][ROSE] Trivial compilation CONFIG_INET=n case
[PATCH][ROSE] Trivial compilation CONFIG_INET=n case [message #24391] Tue, 04 December 2007 15:11 Go to next message
Pavel Emelianov is currently offline  Pavel Emelianov
Messages: 1149
Registered: September 2006
Senior Member
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
Re: [PATCH][ROSE] Trivial compilation CONFIG_INET=n case [message #24461 is a reply to message #24391] Wed, 05 December 2007 10:17 Go to previous message
davem is currently offline  davem
Messages: 463
Registered: February 2006
Senior Member
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.
Previous Topic: [PATCH 1/4] netns: Tag the network flow with the network namespace it is in (v2)
Next Topic: [PATCH][IRDA] Move ircomm_tty_line_info() under #ifdef CONFIG_PROC_FS
Goto Forum:
  


Current Time: Tue Oct 15 01:59:36 GMT 2024

Total time taken to generate the page: 0.05152 seconds