From d8b53631f81f06d8f7ede41a6897d2785ec6ccaa Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sat, 7 Jun 2014 16:08:55 +0200 Subject: [PATCH] backports: revert rename of __vlan_find_dev_deep() This function was renamed in this commit in mainline linux: commit f06c7f9f92295faf701a9628b383156c4efb6119 Author: dingtianhong Date: Fri May 9 14:58:05 2014 +0800 vlan: rename __vlan_find_dev_deep() to __vlan_find_dev_deep_rcu() Signed-off-by: Hauke Mehrtens --- backport/backport-include/linux/if_vlan.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/backport/backport-include/linux/if_vlan.h b/backport/backport-include/linux/if_vlan.h index 6fae15071178..7d39d524f924 100644 --- a/backport/backport-include/linux/if_vlan.h +++ b/backport/backport-include/linux/if_vlan.h @@ -20,4 +20,8 @@ #define VLAN_PRIO_SHIFT 13 #endif +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,16,0) +#define __vlan_find_dev_deep_rcu(real_dev, vlan_proto, vlan_id) __vlan_find_dev_deep(real_dev, vlan_proto, vlan_id) +#endif + #endif /* __BACKPORT_LINUX_IF_VLAN_H_ */ -- 2.30.2