This commit was manufactured by cvs2svn to create tag

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

diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index 162870f..df4cd76 100644 (file)
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -453,11 +453,8 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev,  struct packe
        sk = pt->af_packet_priv;
        po = pkt_sk(sk);
 
-#if defined(CONFIG_VNET) || defined(CONFIG_VNET_MODULE)
-       if (vnet_active &&
-           (int) sk->sk_xid > 0 && sk->sk_xid != skb->xid)
+       if ((int) sk->sk_xid > 0 && sk->sk_xid != skb->xid)
                goto drop;
-#endif
 
        skb->dev = dev;
 
@@ -1745,8 +1742,7 @@ static int packet_mmap(struct file *file, struct socket *sock, struct vm_area_st
        start = vma->vm_start;
        err = -EAGAIN;
        for (i=0; i<po->pg_vec_len; i++) {
-               if (remap_pfn_range(vma, start,
-                                    __pa(po->pg_vec[i]) >> PAGE_SHIFT,
+               if (remap_page_range(vma, start, __pa(po->pg_vec[i]),
                                     po->pg_vec_pages*PAGE_SIZE,
                                     vma->vm_page_prot))
                        goto out;
@@ -1805,19 +1801,14 @@ struct proto_ops packet_ops = {
        .mmap =         packet_mmap,
        .sendpage =     sock_no_sendpage,
 };
-
-#if defined(CONFIG_VNET) || defined(CONFIG_VNET_MODULE)
 EXPORT_SYMBOL(packet_ops);
-struct net_proto_family packet_family_ops;
-EXPORT_SYMBOL(packet_family_ops);
-#else
-static
-#endif
+
 struct net_proto_family packet_family_ops = {
        .family =       PF_PACKET,
        .create =       packet_create,
        .owner  =       THIS_MODULE,
 };
+EXPORT_SYMBOL(packet_family_ops);
 
 static struct notifier_block packet_netdev_notifier = {
        .notifier_call =packet_notifier,