From 9f1af7990191b03815b1af3a22e5aad5039cf0a3 Mon Sep 17 00:00:00 2001 From: Kevin Locke Date: Sat, 19 Dec 2009 13:50:46 -0700 Subject: [PATCH] Rename skb->iif to skb->skb_iif for 2.6.32+ The rename occurred in v2.6.32-rc7-1555-g8964be4, which will hit mainline in 2.6.33. Signed-off-by: Kevin Locke --- extensions/compat_skbuff.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/extensions/compat_skbuff.h b/extensions/compat_skbuff.h index 2778fb4..df210f5 100644 --- a/extensions/compat_skbuff.h +++ b/extensions/compat_skbuff.h @@ -25,9 +25,12 @@ static inline struct rtable *skb_rtable(const struct sk_buff *skb) # define skb_ifindex(skb) \ (((skb)->input_dev != NULL) ? (skb)->input_dev->ifindex : 0) # define skb_nfmark(skb) (((struct sk_buff *)(skb))->nfmark) -#else +#elif LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 32) # define skb_ifindex(skb) (skb)->iif # define skb_nfmark(skb) (((struct sk_buff *)(skb))->mark) +#else +# define skb_ifindex(skb) (skb)->skb_iif +# define skb_nfmark(skb) (((struct sk_buff *)(skb))->mark) #endif #ifdef CONFIG_NETWORK_SECMARK