From 38baee946ad52e57008ad2ef2660a8f654c959e2 Mon Sep 17 00:00:00 2001 From: Michael Riesch Date: Thu, 29 Sep 2011 04:06:26 +0000 Subject: [PATCH] --- yaml --- r: 266205 b: refs/heads/master c: f9b491ecc47ead6a57576a1a40cb27fd79835cc2 h: refs/heads/master i: 266203: 44cb4a3496747563d98ab359e186eb3374e2c689 v: v3 --- [refs] | 2 +- trunk/drivers/net/usb/usbnet.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index fded6caad091..74e109c237af 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7f5c6addcdc039c1a7c435857e6284ecac5d97c8 +refs/heads/master: f9b491ecc47ead6a57576a1a40cb27fd79835cc2 diff --git a/trunk/drivers/net/usb/usbnet.c b/trunk/drivers/net/usb/usbnet.c index ce395fe5de26..cdb958875ba4 100644 --- a/trunk/drivers/net/usb/usbnet.c +++ b/trunk/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,8 @@ netdev_tx_t usbnet_start_xmit (struct sk_buff *skb, unsigned long flags; int retval; + skb_tx_timestamp(skb); + // some devices want funky USB-level framing, for // win32 driver (usually) and/or hardware quirks if (info->tx_fixup) {