aboutsummaryrefslogtreecommitdiffstats
path: root/net/netfilter/nf_queue.c
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2009-06-02 13:44:56 +0200
committerPatrick McHardy <kaber@trash.net>2009-06-02 13:44:56 +0200
commit8cc848fa3445b3503465dfba5d8ad47559faa05a (patch)
tree6fe6128de6b6791493809b2ce440217579a0d6a8 /net/netfilter/nf_queue.c
parentnetfilter: conntrack: add support for DCCP handshake sequence to ctnetlink (diff)
parentnetfilter: xtables: print hook name instead of mask (diff)
downloadlinux-dev-8cc848fa3445b3503465dfba5d8ad47559faa05a.tar.xz
linux-dev-8cc848fa3445b3503465dfba5d8ad47559faa05a.zip
Merge branch 'master' of git://dev.medozas.de/linux
Diffstat (limited to 'net/netfilter/nf_queue.c')
-rw-r--r--net/netfilter/nf_queue.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/netfilter/nf_queue.c b/net/netfilter/nf_queue.c
index 4f2310c93e01..3a6fd77f7761 100644
--- a/net/netfilter/nf_queue.c
+++ b/net/netfilter/nf_queue.c
@@ -204,10 +204,10 @@ int nf_queue(struct sk_buff *skb,
queuenum);
switch (pf) {
- case AF_INET:
+ case NFPROTO_IPV4:
skb->protocol = htons(ETH_P_IP);
break;
- case AF_INET6:
+ case NFPROTO_IPV6:
skb->protocol = htons(ETH_P_IPV6);
break;
}