diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h
index d6326b53e3364c4982cad4eb8fe59fa7bbf75d84..2cc41c01bda8e67566f03ef981b5163ba1eb3097 100644
--- a/include/linux/if_vlan.h
+++ b/include/linux/if_vlan.h
@@ -585,13 +585,16 @@ static inline int vlan_get_tag(const struct sk_buff *skb, u16 *vlan_tci)
  * vlan_get_protocol - get protocol EtherType.
  * @skb: skbuff to query
  * @type: first vlan protocol
+ * @offset: offset
  * @depth: buffer to store length of eth and vlan tags in bytes
  *
  * Returns: the EtherType of the packet, regardless of whether it is
  * vlan encapsulated (normal or hardware accelerated) or not.
  */
-static inline __be16 __vlan_get_protocol(const struct sk_buff *skb, __be16 type,
-                                        int *depth)
+static inline __be16 __vlan_get_protocol_offset(const struct sk_buff *skb,
+                                               __be16 type,
+                                               int offset,
+                                               int *depth)
 {
        unsigned int vlan_depth = skb->mac_len, parse_depth = VLAN_MAX_DEPTH;
 
@@ -610,7 +613,8 @@ static inline __be16 __vlan_get_protocol(const struct sk_buff *skb, __be16 type,
                do {
                        struct vlan_hdr vhdr, *vh;
 
-                       vh = skb_header_pointer(skb, vlan_depth, sizeof(vhdr), &vhdr);
+                       vh = skb_header_pointer(skb, offset + vlan_depth,
+                                               sizeof(vhdr), &vhdr);
                        if (unlikely(!vh || !--parse_depth))
                                return 0;
 
@@ -625,6 +629,12 @@ static inline __be16 __vlan_get_protocol(const struct sk_buff *skb, __be16 type,
        return type;
 }
 
+static inline __be16 __vlan_get_protocol(const struct sk_buff *skb, __be16 type,
+                                        int *depth)
+{
+       return __vlan_get_protocol_offset(skb, type, 0, depth);
+}
+
 /**
  * vlan_get_protocol - get protocol EtherType.
  * @skb: skbuff to query
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index f8d87d622699db2f32b4f93457cd1c44fec0b4c5..6e2c9551181033fc93a998f229729f99f88b6fe0 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -538,12 +538,11 @@ static void *packet_current_frame(struct packet_sock *po,
        return packet_lookup_frame(po, rb, rb->head, status);
 }
 
-static u16 vlan_get_tci(struct sk_buff *skb, struct net_device *dev)
+static u16 vlan_get_tci(const struct sk_buff *skb, struct net_device *dev)
 {
-       u8 *skb_orig_data = skb->data;
-       int skb_orig_len = skb->len;
        struct vlan_hdr vhdr, *vh;
        unsigned int header_len;
+       int offset;
 
        if (!dev)
                return 0;
@@ -562,32 +561,23 @@ static u16 vlan_get_tci(struct sk_buff *skb, struct net_device *dev)
        else
                return 0;
 
-       skb_push(skb, skb->data - skb_mac_header(skb));
-       vh = skb_header_pointer(skb, header_len, sizeof(vhdr), &vhdr);
-       if (skb_orig_data != skb->data) {
-               skb->data = skb_orig_data;
-               skb->len = skb_orig_len;
-       }
+       offset = skb->data - skb_mac_header(skb);
+       vh = skb_header_pointer(skb, header_len - offset,
+                               sizeof(vhdr), &vhdr);
        if (unlikely(!vh))
                return 0;
 
        return ntohs(vh->h_vlan_TCI);
 }
 
-static __be16 vlan_get_protocol_dgram(struct sk_buff *skb)
+static __be16 vlan_get_protocol_dgram(const struct sk_buff *skb)
 {
        __be16 proto = skb->protocol;
 
        if (unlikely(eth_type_vlan(proto))) {
-               u8 *skb_orig_data = skb->data;
-               int skb_orig_len = skb->len;
-
-               skb_push(skb, skb->data - skb_mac_header(skb));
-               proto = __vlan_get_protocol(skb, proto, NULL);
-               if (skb_orig_data != skb->data) {
-                       skb->data = skb_orig_data;
-                       skb->len = skb_orig_len;
-               }
+               int offset = skb->data - skb_mac_header(skb);
+
+               proto = __vlan_get_protocol_offset(skb, proto, -offset, NULL);
        }
 
        return proto;