Add changes from the Linux-2.6 tree.

[linux-2.6.git] / net / packet / af_packet.c

diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index da7672a..e0e301c 100644 (file)
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -79,6 +79,7 @@
 #include <linux/poll.h>
 #include <linux/module.h>
 #include <linux/init.h>
+#include <linux/vs_network.h>
 
 #ifdef CONFIG_INET
 #include <net/inet_common.h>
@@ -264,8 +265,7 @@ static void packet_sock_destruct(struct sock *sk)
 }
 
 
-static const
-struct proto_ops packet_ops;
+static const struct proto_ops packet_ops;
 
 #ifdef CONFIG_SOCK_PACKET
 static const struct proto_ops packet_ops_spkt;
@@ -445,6 +445,15 @@ static inline unsigned int run_filter(struct sk_buff *skb, struct sock *sk,
                                      unsigned int res)
 {
        struct sk_filter *filter;
+       struct nx_info *nxi = sk->sk_nx_info;
+       int tag = skb->skb_tag;
+
+       vxdprintk(VXD_CBIT(net, 8),
+               "run_filter: %p[#%u] #%d %d",
+               nxi, nxi?nxi->nx_id:0, tag, res);
+       
+       if (nxi && !((tag == 1) || (nxi->nx_id == tag)))
+               return 0;
 
        rcu_read_lock_bh();
        filter = rcu_dereference(sk->sk_filter);
@@ -1006,7 +1015,7 @@ static int packet_create(struct socket *sock, int protocol)
        __be16 proto = (__force __be16)protocol; /* weird, but documented */
        int err;
 
-       if (!capable(CAP_NET_RAW))
+       if (!nx_capable(CAP_NET_RAW, NXC_RAW_SEND))
                return -EPERM;
        if (sock->type != SOCK_DGRAM && sock->type != SOCK_RAW
 #ifdef CONFIG_SOCK_PACKET
@@ -1854,8 +1863,7 @@ static const struct proto_ops packet_ops_spkt = {
 };
 #endif
 
-static const
-struct proto_ops packet_ops = {
+static const struct proto_ops packet_ops = {
        .family =       PF_PACKET,
        .owner =        THIS_MODULE,
        .release =      packet_release,
@@ -1876,8 +1884,7 @@ struct proto_ops packet_ops = {
        .sendpage =     sock_no_sendpage,
 };
 
-static
-struct net_proto_family packet_family_ops = {
+static struct net_proto_family packet_family_ops = {
        .family =       PF_PACKET,
        .create =       packet_create,
        .owner  =       THIS_MODULE,