git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of /repos/git/net-next-2.6
[pandora-kernel.git]
/
net
/
ipv6
/
raw.c
diff --git
a/net/ipv6/raw.c
b/net/ipv6/raw.c
index
ed31c37
..
554b48b
100644
(file)
--- a/
net/ipv6/raw.c
+++ b/
net/ipv6/raw.c
@@
-21,6
+21,7
@@
#include <linux/errno.h>
#include <linux/types.h>
#include <linux/socket.h>
#include <linux/errno.h>
#include <linux/types.h>
#include <linux/socket.h>
+#include <linux/slab.h>
#include <linux/sockios.h>
#include <linux/net.h>
#include <linux/in6.h>
#include <linux/sockios.h>
#include <linux/net.h>
#include <linux/in6.h>
@@
-636,8
+637,8
@@
static int rawv6_send_hdrinc(struct sock *sk, void *from, int length,
goto error_fault;
IP6_UPD_PO_STATS(sock_net(sk), rt->rt6i_idev, IPSTATS_MIB_OUT, skb->len);
goto error_fault;
IP6_UPD_PO_STATS(sock_net(sk), rt->rt6i_idev, IPSTATS_MIB_OUT, skb->len);
- err = NF_HOOK(
PF_INET6, NF_INET_LOCAL_OUT, skb, NULL, rt->u.dst.dev
,
- dst_output);
+ err = NF_HOOK(
NFPROTO_IPV6, NF_INET_LOCAL_OUT, skb, NULL
,
+
rt->u.dst.dev,
dst_output);
if (err > 0)
err = net_xmit_errno(err);
if (err)
if (err > 0)
err = net_xmit_errno(err);
if (err)