Re: [net-next-2.6] if_vlan.h: fix compile errors

[Jeff Kirsher <jeffrey.t.kirsher@intel.com>]

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