From: Kevin Locke <kevin@kevinlocke.name>
To: netfilter-devel@vger.kernel.org
Cc: Kevin Locke <kevin@kevinlocke.name>
Subject: [xtables-addons][PATCH 1/2] Rename skb->iif to skb->skb_iif for after 2.6.32
Date: Sat, 19 Dec 2009 13:50:46 -0700 [thread overview]
Message-ID: <1261255847-16395-2-git-send-email-kevin@kevinlocke.name> (raw)
In-Reply-To: <1261255847-16395-1-git-send-email-kevin@kevinlocke.name>
The rename occurred in 8964be4a9a5ca8cab1219bb046db2f6d1936227c,
which will hit mainline in 2.6.33.
Signed-off-by: Kevin Locke <kevin@kevinlocke.name>
---
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
next prev parent reply other threads:[~2009-12-19 21:06 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-19 20:50 [xtables-addons][PATCH 0/2] Misc ipset issues Kevin Locke
2009-12-19 20:50 ` Kevin Locke [this message]
2009-12-19 20:50 ` [xtables-addons][PATCH 2/2] Build ip_set_setlist.ko module Kevin Locke
2009-12-20 9:36 ` [xtables-addons][PATCH 0/2] Misc ipset issues Jozsef Kadlecsik
2009-12-31 15:18 ` Jan Engelhardt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1261255847-16395-2-git-send-email-kevin@kevinlocke.name \
--to=kevin@kevinlocke.name \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).