On Wed, Oct 15, 2008 at 5:06 AM, David Miller <davem@xxxxxxxxxxxxx> wrote:
> From: Marcin Slusarz <marcin.slusarz@xxxxxxxxx>
> 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@xxxxxxxxx>
---
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 kernel-janitors" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
