Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

[linux-2.6-omap-h63xx.git] / arch / um / drivers / pcap_kern.c

diff --git a/arch/um/drivers/pcap_kern.c b/arch/um/drivers/pcap_kern.c
index da0403efbc0d3c8110853921c97a01e131679671..2860525f8ff6d56219e81dd2fe7afa8f3c627c35 100644 (file)
--- a/arch/um/drivers/pcap_kern.c
+++ b/arch/um/drivers/pcap_kern.c
@@ -21,7 +21,7 @@ void pcap_init(struct net_device *dev, void *data)
        struct pcap_data *ppri;
        struct pcap_init *init = data;
 
-       pri = dev->priv;
+       pri = netdev_priv(dev);
        ppri = (struct pcap_data *) pri->user;
        ppri->host_if = init->host_if;
        ppri->promisc = init->promisc;
@@ -31,19 +31,14 @@ void pcap_init(struct net_device *dev, void *data)
        printk("pcap backend, host interface %s\n", ppri->host_if);
 }
 
-static int pcap_read(int fd, struct sk_buff **skb,
-                      struct uml_net_private *lp)
+static int pcap_read(int fd, struct sk_buff *skb, struct uml_net_private *lp)
 {
-       *skb = ether_adjust_skb(*skb, ETH_HEADER_OTHER);
-       if (*skb == NULL)
-               return -ENOMEM;
-
-       return pcap_user_read(fd, skb_mac_header(*skb),
-                             (*skb)->dev->mtu + ETH_HEADER_OTHER,
+       return pcap_user_read(fd, skb_mac_header(skb),
+                             skb->dev->mtu + ETH_HEADER_OTHER,
                              (struct pcap_data *) &lp->user);
 }
 
-static int pcap_write(int fd, struct sk_buff **skb, struct uml_net_private *lp)
+static int pcap_write(int fd, struct sk_buff *skb, struct uml_net_private *lp)
 {
        return -EPERM;
 }