[Blackfin] arch: fix bug - linux-2.6.24 (delayed) disable IRQ feature not functional...

[linux-2.6] / arch / um / drivers / slirp_kern.c

diff --git a/arch/um/drivers/slirp_kern.c b/arch/um/drivers/slirp_kern.c
index b208d5e4a405d97806720a7c519b2e3a4e389999..d987af277db9d8f1cc943aa72ab46201e57cbb58 100644 (file)
--- a/arch/um/drivers/slirp_kern.c
+++ b/arch/um/drivers/slirp_kern.c
@@ -34,9 +34,7 @@ void slirp_init(struct net_device *dev, void *data)
 
        dev->init = NULL;
        dev->hard_header_len = 0;
-       dev->header_cache_update = NULL;
-       dev->hard_header_cache = NULL;
-       dev->hard_header = NULL;
+       dev->header_ops = NULL;
        dev->addr_len = 0;
        dev->type = ARPHRD_SLIP;
        dev->tx_queue_len = 256;
@@ -52,18 +50,16 @@ static unsigned short slirp_protocol(struct sk_buff *skbuff)
        return htons(ETH_P_IP);
 }
 
-static int slirp_read(int fd, struct sk_buff **skb,
-                      struct uml_net_private *lp)
+static int slirp_read(int fd, struct sk_buff *skb, struct uml_net_private *lp)
 {
-       return slirp_user_read(fd, skb_mac_header(*skb), (*skb)->dev->mtu,
-                             (struct slirp_data *) &lp->user);
+       return slirp_user_read(fd, skb_mac_header(skb), skb->dev->mtu,
+                              (struct slirp_data *) &lp->user);
 }
 
-static int slirp_write(int fd, struct sk_buff **skb,
-                     struct uml_net_private *lp)
+static int slirp_write(int fd, struct sk_buff *skb, struct uml_net_private *lp)
 {
-       return slirp_user_write(fd, (*skb)->data, (*skb)->len,
-                              (struct slirp_data *) &lp->user);
+       return slirp_user_write(fd, skb->data, skb->len,
+                               (struct slirp_data *) &lp->user);
 }
 
 const struct net_kern_info slirp_kern_info = {