Pull utrace into release branch

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

diff --git a/arch/um/drivers/slip_kern.c b/arch/um/drivers/slip_kern.c
index ae67e7158e718c495657b51b3b1c933ab61cf0e9..d19faec7046e5cdb05eba59ff32c1c1beb477beb 100644 (file)
--- a/arch/um/drivers/slip_kern.c
+++ b/arch/um/drivers/slip_kern.c
@@ -13,7 +13,7 @@ struct slip_init {
        char *gate_addr;
 };
 
-void slip_init(struct net_device *dev, void *data)
+static void slip_init(struct net_device *dev, void *data)
 {
        struct uml_net_private *private;
        struct slip_data *spri;
@@ -31,10 +31,8 @@ void slip_init(struct net_device *dev, void *data)
        slip_proto_init(&spri->slip);
 
        dev->init = NULL;
-       dev->header_cache_update = NULL;
-       dev->hard_header_cache = NULL;
-       dev->hard_header = NULL;
        dev->hard_header_len = 0;
+       dev->header_ops = NULL;
        dev->addr_len = 0;
        dev->type = ARPHRD_SLIP;
        dev->tx_queue_len = 256;
@@ -59,7 +57,7 @@ static int slip_write(int fd, struct sk_buff *skb, struct uml_net_private *lp)
                               (struct slip_data *) &lp->user);
 }
 
-const struct net_kern_info slip_kern_info = {
+static const struct net_kern_info slip_kern_info = {
        .init                   = slip_init,
        .protocol               = slip_protocol,
        .read                   = slip_read,