* [net-next-2.6] if_vlan.h: fix compile errors
@ 2011-04-13 10:32 Jeff Kirsher
2011-04-13 10:57 ` Jiri Pirko
0 siblings, 1 reply; 4+ messages in thread
From: Jeff Kirsher @ 2011-04-13 10:32 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, jpirko
The following commit generates compile errors becuase vlan_untag was defined
multiple times.
commit bcc6d47903612c3861201cc3a866fb604f26b8b2
Author: Jiri Pirko <jpirko@redhat.com>
Date: Thu Apr 7 19:48:33 2011 +0000
net: vlan: make non-hw-accel rx path similar to hw-accel
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
include/linux/if_vlan.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h
index 998b299..546d9d3 100644
--- a/include/linux/if_vlan.h
+++ b/include/linux/if_vlan.h
@@ -174,7 +174,7 @@ static inline bool vlan_do_receive(struct sk_buff **skb)
return false;
}
-inline struct sk_buff *vlan_untag(struct sk_buff *skb)
+static inline struct sk_buff *vlan_untag(struct sk_buff *skb)
{
return skb;
}
--
1.7.4.2
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [net-next-2.6] if_vlan.h: fix compile errors
2011-04-13 10:32 [net-next-2.6] if_vlan.h: fix compile errors Jeff Kirsher
@ 2011-04-13 10:57 ` Jiri Pirko
2011-04-13 11:03 ` Jeff Kirsher
0 siblings, 1 reply; 4+ messages in thread
From: Jiri Pirko @ 2011-04-13 10:57 UTC (permalink / raw)
To: Jeff Kirsher; +Cc: davem, netdev
Thanks Jeff, this fix was already submitted by DaveM
Wed, Apr 13, 2011 at 12:32:17PM CEST, jeffrey.t.kirsher@intel.com wrote:
>The following commit generates compile errors becuase vlan_untag was defined
>multiple times.
>
> commit bcc6d47903612c3861201cc3a866fb604f26b8b2
> Author: Jiri Pirko <jpirko@redhat.com>
> Date: Thu Apr 7 19:48:33 2011 +0000
>
> net: vlan: make non-hw-accel rx path similar to hw-accel
>
>Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>---
> include/linux/if_vlan.h | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
>diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h
>index 998b299..546d9d3 100644
>--- a/include/linux/if_vlan.h
>+++ b/include/linux/if_vlan.h
>@@ -174,7 +174,7 @@ static inline bool vlan_do_receive(struct sk_buff **skb)
> return false;
> }
>
>-inline struct sk_buff *vlan_untag(struct sk_buff *skb)
>+static inline struct sk_buff *vlan_untag(struct sk_buff *skb)
> {
> return skb;
> }
>--
>1.7.4.2
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [net-next-2.6] if_vlan.h: fix compile errors
2011-04-13 10:57 ` Jiri Pirko
@ 2011-04-13 11:03 ` Jeff Kirsher
2011-04-13 17:46 ` David Miller
0 siblings, 1 reply; 4+ messages in thread
From: Jeff Kirsher @ 2011-04-13 11:03 UTC (permalink / raw)
To: Jiri Pirko; +Cc: davem, netdev
On Wed, Apr 13, 2011 at 03:57, Jiri Pirko <jpirko@redhat.com> wrote:
> Thanks Jeff, this fix was already submitted by DaveM
Ah, ok. I did not see anything in netdev patchworks and I did a
recent pull of Dave's net-next tree so I knew I had the latest.
Good to know it was caught, thanks Jiri.
>
> Wed, Apr 13, 2011 at 12:32:17PM CEST, jeffrey.t.kirsher@intel.com wrote:
>>The following commit generates compile errors becuase vlan_untag was defined
>>multiple times.
>>
>> commit bcc6d47903612c3861201cc3a866fb604f26b8b2
>> Author: Jiri Pirko <jpirko@redhat.com>
>> Date: Thu Apr 7 19:48:33 2011 +0000
>>
>> net: vlan: make non-hw-accel rx path similar to hw-accel
>>
>>Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>>---
>> include/linux/if_vlan.h | 2 +-
>> 1 files changed, 1 insertions(+), 1 deletions(-)
>>
>>diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h
>>index 998b299..546d9d3 100644
>>--- a/include/linux/if_vlan.h
>>+++ b/include/linux/if_vlan.h
>>@@ -174,7 +174,7 @@ static inline bool vlan_do_receive(struct sk_buff **skb)
>> return false;
>> }
>>
>>-inline struct sk_buff *vlan_untag(struct sk_buff *skb)
>>+static inline struct sk_buff *vlan_untag(struct sk_buff *skb)
>> {
>> return skb;
>> }
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [net-next-2.6] if_vlan.h: fix compile errors
2011-04-13 11:03 ` Jeff Kirsher
@ 2011-04-13 17:46 ` David Miller
0 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2011-04-13 17:46 UTC (permalink / raw)
To: jeffrey.t.kirsher; +Cc: jpirko, netdev
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Wed, 13 Apr 2011 04:03:57 -0700
> On Wed, Apr 13, 2011 at 03:57, Jiri Pirko <jpirko@redhat.com> wrote:
>> Thanks Jeff, this fix was already submitted by DaveM
>
> Ah, ok. I did not see anything in netdev patchworks and I did a
> recent pull of Dave's net-next tree so I knew I had the latest.
> Good to know it was caught, thanks Jiri.
Sorry, forgot to push before going to bed :-/
It's there now.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-04-13 17:47 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-04-13 10:32 [net-next-2.6] if_vlan.h: fix compile errors Jeff Kirsher
2011-04-13 10:57 ` Jiri Pirko
2011-04-13 11:03 ` Jeff Kirsher
2011-04-13 17:46 ` 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).