diff options
| author | David S. Miller <davem@davemloft.net> | 2009-06-11 20:00:44 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-11 20:00:44 -0700 |
| commit | adf76cfe24dab32a54e2dd1f51534cea8277f32a (patch) | |
| tree | 6935c74a4b7237bd5f95918b3145ac57e0769fca /net/netfilter/nf_queue.c | |
| parent | 17d0cdfa8f3c09a110061c67421d662b3e149d0a (diff) | |
| parent | 24992eacd8a9f4af286bdaaab627b6802ceb8bce (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
Diffstat (limited to 'net/netfilter/nf_queue.c')
| -rw-r--r-- | net/netfilter/nf_queue.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/netfilter/nf_queue.c b/net/netfilter/nf_queue.c index 4f2310c93e0..3a6fd77f776 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; } |