Patchwork : Fix compilation warnings in net/802/fc.c

login
register
mail settings
Submitter Manish Katiyar
Date Oct. 15, 2008, 3:36 a.m.
Message ID <ea11fea30810142036i22d02a32i571fc0ea7c0e2dff@mail.gmail.com>
Download mbox | patch
Permalink /patch/4553/
State Changes Requested
Delegated to: David Miller
Headers show

Comments

Manish Katiyar - Oct. 15, 2008, 3:36 a.m.
On Wed, Oct 15, 2008 at 5:06 AM, David Miller <davem@davemloft.net> wrote:
> From: Marcin Slusarz <marcin.slusarz@gmail.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@gmail.com>

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

 #else
 	return 0;
David Miller - Oct. 15, 2008, 6:17 a.m.
From: "Manish Katiyar" <mkatiyar@gmail.com>
Date: Wed, 15 Oct 2008 09:06:12 +0530

> Updated the below patch as per suggestions.
> 
> Signed-off-by: Manish Katiyar <mkatiyar@gmail.com>
> 

Your email client corrupted the patch, changing tabs into
spaces and breaking up long lines.  This makes the patch
not usable.

Please fix this up and resubmit, thanks.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller - Oct. 15, 2008, 7:14 a.m.
From: "Manish Katiyar" <mkatiyar@gmail.com>
Date: Wed, 15 Oct 2008 12:33:03 +0530

> On Wed, Oct 15, 2008 at 11:47 AM, David Miller <davem@davemloft.net> wrote:
> > From: "Manish Katiyar" <mkatiyar@gmail.com>
> > Date: Wed, 15 Oct 2008 09:06:12 +0530
> >
> >> Updated the below patch as per suggestions.
> >>
> >> Signed-off-by: Manish Katiyar <mkatiyar@gmail.com>
> >>
> >
> > Your email client corrupted the patch, changing tabs into
> > spaces and breaking up long lines.  This makes the patch
> > not usable.
> 
> I had already set the mail client to avoid such issues :-(. Attached
> the patch with the mail. Will that help ? or do I need to send again
> in the mail body itself ?

This works, patch applied, thanks.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

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);