The rename occurred in 8964be4a9a5ca8cab1219bb046db2f6d1936227c, which will hit mainline in 2.6.33. Signed-off-by: Kevin Locke <kevin@xxxxxxxxxxxxxxx> --- extensions/compat_skbuff.h | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) 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 -- 1.6.5 -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
