Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

8 files changed, 20 insertions, 24 deletions

diff --git a/arch/um/drivers/daemon_kern.c b/arch/um/drivers/daemon_kern.c
index d53ff52bb404..b4a1522f2157 100644
--- a/arch/um/drivers/daemon_kern.c
+++ b/arch/um/drivers/daemon_kern.c
@@ -22,7 +22,7 @@ static void daemon_init(struct net_device *dev, void *data)
         struct daemon_data *dpri;
         struct daemon_init *init = data;
 
-        pri = dev->priv;
+        pri = netdev_priv(dev);
         dpri = (struct daemon_data *) pri->user;
         dpri->sock_type = init->sock_type;
         dpri->ctl_sock = init->ctl_sock;
diff --git a/arch/um/drivers/mcast_kern.c b/arch/um/drivers/mcast_kern.c
index 8c4378a76d63..ffc6416d5ed7 100644
--- a/arch/um/drivers/mcast_kern.c
+++ b/arch/um/drivers/mcast_kern.c
@@ -28,7 +28,7 @@ static void mcast_init(struct net_device *dev, void *data)
         struct mcast_data *dpri;
         struct mcast_init *init = data;
 
-        pri = dev->priv;
+        pri = netdev_priv(dev);
         dpri = (struct mcast_data *) pri->user;
         dpri->addr = init->addr;
         dpri->port = init->port;
diff --git a/arch/um/drivers/mconsole_kern.c b/arch/um/drivers/mconsole_kern.c
index 8f44ebb0dec8..e14629c87de4 100644
--- a/arch/um/drivers/mconsole_kern.c
+++ b/arch/um/drivers/mconsole_kern.c
@@ -161,7 +161,8 @@ void mconsole_proc(struct mc_request *req)
                 goto out_kill;
         }
 
-        file = dentry_open(nd.path.dentry, nd.path.mnt, O_RDONLY);
+        file = dentry_open(nd.path.dentry, nd.path.mnt, O_RDONLY,
+                           current_cred());
         if (IS_ERR(file)) {
                 mconsole_reply(req, "Failed to open file", 1, 0);
                 goto out_kill;
diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c
index 5b4ca8d93682..fde510b664d3 100644
--- a/arch/um/drivers/net_kern.c
+++ b/arch/um/drivers/net_kern.c
@@ -76,7 +76,7 @@ out:
 
 static int uml_net_rx(struct net_device *dev)
 {
-        struct uml_net_private *lp = dev->priv;
+        struct uml_net_private *lp = netdev_priv(dev);
         int pkt_len;
         struct sk_buff *skb;
 
@@ -119,7 +119,7 @@ static void uml_dev_close(struct work_struct *work)
 static irqreturn_t uml_net_interrupt(int irq, void *dev_id)
 {
         struct net_device *dev = dev_id;
-        struct uml_net_private *lp = dev->priv;
+        struct uml_net_private *lp = netdev_priv(dev);
         int err;
 
         if (!netif_running(dev))
@@ -150,7 +150,7 @@ out:
 
 static int uml_net_open(struct net_device *dev)
 {
-        struct uml_net_private *lp = dev->priv;
+        struct uml_net_private *lp = netdev_priv(dev);
         int err;
 
         if (lp->fd >= 0) {
@@ -195,7 +195,7 @@ out:
 
 static int uml_net_close(struct net_device *dev)
 {
-        struct uml_net_private *lp = dev->priv;
+        struct uml_net_private *lp = netdev_priv(dev);
 
         netif_stop_queue(dev);
 
@@ -213,7 +213,7 @@ static int uml_net_close(struct net_device *dev)
 
 static int uml_net_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
-        struct uml_net_private *lp = dev->priv;
+        struct uml_net_private *lp = netdev_priv(dev);
         unsigned long flags;
         int len;
 
@@ -250,7 +250,7 @@ static int uml_net_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
 static struct net_device_stats *uml_net_get_stats(struct net_device *dev)
 {
-        struct uml_net_private *lp = dev->priv;
+        struct uml_net_private *lp = netdev_priv(dev);
         return &lp->stats;
 }
 
@@ -267,7 +267,7 @@ static void uml_net_tx_timeout(struct net_device *dev)
 
 static int uml_net_set_mac(struct net_device *dev, void *addr)
 {
-        struct uml_net_private *lp = dev->priv;
+        struct uml_net_private *lp = netdev_priv(dev);
         struct sockaddr *hwaddr = addr;
 
         spin_lock_irq(&lp->lock);
@@ -368,7 +368,7 @@ static void net_device_release(struct device *dev)
 {
         struct uml_net *device = dev->driver_data;
         struct net_device *netdev = device->dev;
-        struct uml_net_private *lp = netdev->priv;
+        struct uml_net_private *lp = netdev_priv(netdev);
 
         if (lp->remove != NULL)
                 (*lp->remove)(&lp->user);
@@ -418,14 +418,9 @@ static void eth_configure(int n, void *init, char *mac,
 
         setup_etheraddr(mac, device->mac, dev->name);
 
-        printk(KERN_INFO "Netdevice %d ", n);
-        printk("(%02x:%02x:%02x:%02x:%02x:%02x) ",
-               device->mac[0], device->mac[1],
-               device->mac[2], device->mac[3],
-               device->mac[4], device->mac[5]);
-        printk(": ");
+        printk(KERN_INFO "Netdevice %d (%pM) : ", n, device->mac);
 
-        lp = dev->priv;
+        lp = netdev_priv(dev);
         /* This points to the transport private data. It's still clear, but we
          * must memset it to 0 *now*. Let's help the drivers. */
         memset(lp, 0, size);
@@ -735,7 +730,7 @@ static int net_remove(int n, char **error_out)
                 return -ENODEV;
 
         dev = device->dev;
-        lp = dev->priv;
+        lp = netdev_priv(dev);
         if (lp->fd > 0)
                 return -EBUSY;
         unregister_netdev(dev);
@@ -766,7 +761,7 @@ static int uml_inetaddr_event(struct notifier_block *this, unsigned long event,
         if (dev->open != uml_net_open)
                 return NOTIFY_DONE;
 
-        lp = dev->priv;
+        lp = netdev_priv(dev);
 
         proc = NULL;
         switch (event) {
diff --git a/arch/um/drivers/pcap_kern.c b/arch/um/drivers/pcap_kern.c
index 3a750dd39be1..2860525f8ff6 100644
--- 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;
diff --git a/arch/um/drivers/slip_kern.c b/arch/um/drivers/slip_kern.c
index d19faec7046e..5ec17563142e 100644
--- a/arch/um/drivers/slip_kern.c
+++ b/arch/um/drivers/slip_kern.c
@@ -19,7 +19,7 @@ static void slip_init(struct net_device *dev, void *data)
         struct slip_data *spri;
         struct slip_init *init = data;
 
-        private = dev->priv;
+        private = netdev_priv(dev);
         spri = (struct slip_data *) private->user;
 
         memset(spri->name, 0, sizeof(spri->name));
diff --git a/arch/um/drivers/slirp_kern.c b/arch/um/drivers/slirp_kern.c
index d987af277db9..f15a6e7654f3 100644
--- a/arch/um/drivers/slirp_kern.c
+++ b/arch/um/drivers/slirp_kern.c
@@ -22,7 +22,7 @@ void slirp_init(struct net_device *dev, void *data)
         struct slirp_init *init = data;
         int i;
 
-        private = dev->priv;
+        private = netdev_priv(dev);
         spri = (struct slirp_data *) private->user;
 
         spri->argw = init->argw;
diff --git a/arch/um/drivers/vde_kern.c b/arch/um/drivers/vde_kern.c
index add7e722defb..1b852bffdebc 100644
--- a/arch/um/drivers/vde_kern.c
+++ b/arch/um/drivers/vde_kern.c
@@ -19,7 +19,7 @@ static void vde_init(struct net_device *dev, void *data)
         struct uml_net_private *pri;
         struct vde_data *vpri;
 
-        pri = dev->priv;
+        pri = netdev_priv(dev);
         vpri = (struct vde_data *) pri->user;
 
         vpri->vde_switch = init->vde_switch;