Commit 18149935 authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller
Browse files

[VLAN]: Constify skb argument to vlan_get_tag() 



Required by next patch to use it from the flow classifier.

Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4f250491

include/linux/if_vlan.h

+4 −3
Original line number Diff line number Diff line
@@ -327,7 +327,7 @@ static inline struct sk_buff *vlan_put_tag(struct sk_buff *skb, unsigned short t 
 * 

 * Returns error if the skb is not of VLAN type

 */

static inline int __vlan_get_tag(struct sk_buff *skb, unsigned short *tag)

static inline int __vlan_get_tag(const struct sk_buff *skb, unsigned short *tag)

{

	struct vlan_ethhdr *veth = (struct vlan_ethhdr *)skb->data;
@@ -347,7 +347,8 @@ static inline int __vlan_get_tag(struct sk_buff *skb, unsigned short *tag) 
 * 

 * Returns error if @skb->cb[] is not set correctly

 */

static inline int __vlan_hwaccel_get_tag(struct sk_buff *skb, unsigned short *tag)

static inline int __vlan_hwaccel_get_tag(const struct sk_buff *skb,

					 unsigned short *tag)

{

	struct vlan_skb_tx_cookie *cookie;
@@ -370,7 +371,7 @@ static inline int __vlan_hwaccel_get_tag(struct sk_buff *skb, unsigned short *ta 
 * 

 * Returns error if the skb is not VLAN tagged

 */

static inline int vlan_get_tag(struct sk_buff *skb, unsigned short *tag)

static inline int vlan_get_tag(const struct sk_buff *skb, unsigned short *tag)

{

	if (skb->dev->features & NETIF_F_HW_VLAN_TX) {

		return __vlan_hwaccel_get_tag(skb, tag);