1 files changed, 2 insertions, 4 deletions

diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 33b6d1b122fb..5a6203072ce7 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -529,7 +529,6 @@ static __inline__ ssize_t tun_get_user(struct tun_struct *tun, struct iovec *iv,
         }
 
         netif_rx_ni(skb);
-        tun->dev->last_rx = jiffies;
 
         tun->dev->stats.rx_packets++;
         tun->dev->stats.rx_bytes += len;
@@ -883,7 +882,6 @@ static int tun_chr_ioctl(struct inode *inode, struct file *file,
         void __user* argp = (void __user*)arg;
         struct ifreq ifr;
         int ret;
-        DECLARE_MAC_BUF(mac);
 
         if (cmd == TUNSETIFF || _IOC_TYPE(cmd) == 0x89)
                 if (copy_from_user(&ifr, argp, sizeof ifr))
@@ -1011,8 +1009,8 @@ static int tun_chr_ioctl(struct inode *inode, struct file *file,
 
         case SIOCSIFHWADDR:
                 /* Set hw address */
-                DBG(KERN_DEBUG "%s: set hw address: %s\n",
-                        tun->dev->name, print_mac(mac, ifr.ifr_hwaddr.sa_data));
+                DBG(KERN_DEBUG "%s: set hw address: %pM\n",
+                        tun->dev->name, ifr.ifr_hwaddr.sa_data);
 
                 rtnl_lock();
                 ret = dev_set_mac_address(tun->dev, &ifr.ifr_hwaddr);