Merge branch 'next' into for-linus

1 files changed, 8 insertions, 1 deletions

diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index ce395fe5de26..fae0fbd8bc88 100644
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -238,6 +238,10 @@ void usbnet_skb_return (struct usbnet *dev, struct sk_buff *skb)
         netif_dbg(dev, rx_status, dev->net, "< rx, len %zu, type 0x%x\n",
                   skb->len + sizeof (struct ethhdr), skb->protocol);
         memset (skb->cb, 0, sizeof (struct skb_data));
+
+        if (skb_defer_rx_timestamp(skb))
+                return;
+
         status = netif_rx (skb);
         if (status != NET_RX_SUCCESS)
                 netif_dbg(dev, rx_err, dev->net,
@@ -1053,6 +1057,9 @@ netdev_tx_t usbnet_start_xmit (struct sk_buff *skb,
         unsigned long           flags;
         int retval;
 
+        if (skb)
+                skb_tx_timestamp(skb);
+
         // some devices want funky USB-level framing, for
         // win32 driver (usually) and/or hardware quirks
         if (info->tx_fixup) {
@@ -1470,7 +1477,7 @@ int usbnet_suspend (struct usb_interface *intf, pm_message_t message)
         if (!dev->suspend_count++) {
                 spin_lock_irq(&dev->txq.lock);
                 /* don't autosuspend while transmitting */
-                if (dev->txq.qlen && (message.event & PM_EVENT_AUTO)) {
+                if (dev->txq.qlen && PMSG_IS_AUTO(message)) {
                         spin_unlock_irq(&dev->txq.lock);
                         return -EBUSY;
                 } else {