From: Maxim Uvarov <maxim.uvarov@oracle.com>
Date: Tue, 3 Apr 2012 00:16:37 +0000 (-0700)
Subject: fix git merge: vlan: allow nested vlan_do_receive()
X-Git-Tag: v2.6.39-400.9.0~426^2~32
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f205cfbc30b41fdcf5c7cb4ed4f0bcc3bc0a13b9;p=users%2Fjedix%2Flinux-maple.git

fix git merge: vlan: allow nested vlan_do_receive()

Git commit was not cleanly cherry-picked but this changes
are under ifdef so build did not fail on that. Fix it now.
Signed-off-by: Maxim Uvarov <maxim.uvarov@oracle.com>
---

diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h
index e57c19fe0f8b..1404f6a4b1e0 100644
--- a/include/linux/if_vlan.h
+++ b/include/linux/if_vlan.h
@@ -164,7 +164,6 @@ static inline u16 vlan_dev_vlan_id(const struct net_device *dev)
 	return 0;
 }
 
-<<<<<<< HEAD
 static inline int __vlan_hwaccel_rx(struct sk_buff *skb, struct vlan_group *grp,
 				    u16 vlan_tci, int polling)
 {
@@ -172,10 +171,7 @@ static inline int __vlan_hwaccel_rx(struct sk_buff *skb, struct vlan_group *grp,
 	return NET_XMIT_SUCCESS;
 }
 
-static inline bool vlan_do_receive(struct sk_buff **skb)
-=======
 static inline bool vlan_do_receive(struct sk_buff **skb, bool last_handler)
->>>>>>> 6a32e4f... vlan: allow nested vlan_do_receive()
 {
 	if (((*skb)->vlan_tci & VLAN_VID_MASK) && last_handler)
 		(*skb)->pkt_type = PACKET_OTHERHOST;