revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36

[firefly-linux-kernel-4.4.55.git] / net / core / timestamping.c

diff --git a/net/core/timestamping.c b/net/core/timestamping.c
index c19bb4ee405ede196271ac9af5452dd21525fe2e..0ae6c22da85b2a3516980691c8fbcf2f7228e3d6 100644 (file)
--- a/net/core/timestamping.c
+++ b/net/core/timestamping.c
@@ -96,13 +96,11 @@ bool skb_defer_rx_timestamp(struct sk_buff *skb)
        struct phy_device *phydev;
        unsigned int type;
 
-       if (skb_headroom(skb) < ETH_HLEN)
-               return false;
-       __skb_push(skb, ETH_HLEN);
+       skb_push(skb, ETH_HLEN);
 
        type = classify(skb);
 
-       __skb_pull(skb, ETH_HLEN);
+       skb_pull(skb, ETH_HLEN);
 
        switch (type) {
        case PTP_CLASS_V1_IPV4: