netdev - Re: [PATCH] : Fix compilation warnings in net/802/fc.c

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <ea11fea30810142036i22d02a32i571fc0ea7c0e2dff@mail.gmail.com>
Date:	Wed, 15 Oct 2008 09:06:12 +0530
From:	"Manish Katiyar" <mkatiyar@...il.com>
To:	"David Miller" <davem@...emloft.net>
Cc:	marcin.slusarz@...il.com, kernel-janitors@...r.kernel.org,
	netdev@...r.kernel.org
Subject: Re: [PATCH] : Fix compilation warnings in net/802/fc.c

On Wed, Oct 15, 2008 at 5:06 AM, David Miller <davem@...emloft.net> wrote:
> From: Marcin Slusarz <marcin.slusarz@...il.com>
> Date: Tue, 14 Oct 2008 21:35:04 +0200
>
>> On Tue, Oct 14, 2008 at 11:51:24PM +0530, Manish Katiyar wrote:
>> > diff --git a/net/802/fc.c b/net/802/fc.c
>> > index cb3475e..7463109 100644
>> > --- a/net/802/fc.c
>> > +++ b/net/802/fc.c
>> > @@ -82,7 +82,9 @@ static int fc_header(struct sk_buff *skb, struct
>> > net_device *dev,
>> >
>> >  static int fc_rebuild_header(struct sk_buff *skb)
>> >  {
>> > +#ifdef CONFIG_INET
>> >     struct fch_hdr *fch=(struct fch_hdr *)skb->data;
>> > +#endif
>> >     struct fcllc *fcllc=(struct fcllc *)(skb->data+sizeof(struct fch_hdr));
>> >     if(fcllc->ethertype != htons(ETH_P_IP)) {
>> >             printk("fc_rebuild_header: Don't know how to resolve type %04X
>> > addresses ?\n", ntohs(fcllc->ethertype));
>> > --
>>
>> When !CONFIG_INET this function always returns 0 (and does not anything useful)
>> so it probably can be written as:
>>
>> #ifdef CONFIG_INET
>> static int fc_rebuild_header(struct sk_buff *skb)
>> {
>> ...
>> }
>> #else
>> static int fc_rebuild_header(struct sk_buff *skb)
>> {
>>       return 0;
>> }
>> #endif
>
> Yep, agreed.  Could someone respin the patch like this?

Updated the below patch as per suggestions.

Signed-off-by: Manish Katiyar <mkatiyar@...il.com>

---
 net/802/fc.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/802/fc.c b/net/802/fc.c
index cb3475e..34cf1ee 100644
--- a/net/802/fc.c
+++ b/net/802/fc.c
@@ -82,13 +82,13 @@ static int fc_header(struct sk_buff *skb, struct
net_device *dev,

 static int fc_rebuild_header(struct sk_buff *skb)
 {
+#ifdef CONFIG_INET
 	struct fch_hdr *fch=(struct fch_hdr *)skb->data;
 	struct fcllc *fcllc=(struct fcllc *)(skb->data+sizeof(struct fch_hdr));
 	if(fcllc->ethertype != htons(ETH_P_IP)) {
 		printk("fc_rebuild_header: Don't know how to resolve type %04X
addresses ?\n", ntohs(fcllc->ethertype));
 		return 0;
 	}
-#ifdef CONFIG_INET
 	return arp_find(fch->daddr, skb);
 #else
 	return 0;
-- 
1.5.4.3

Thanks -
Manish

>
> Thanks.
>
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html