lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[VLAN]: Constify skb argument to vlan_get_tag()

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

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Patrick McHardy
2008-02-05 16:20:22 -08:00
committed by David S. Miller
parent 4f25049106
commit 181499356e
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/linux/if_vlan.h
View File

@@ -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 * 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; 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 * 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; 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 * 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) { if (skb->dev->features & NETIF_F_HW_VLAN_TX) {
return __vlan_hwaccel_get_tag(skb, tag); return __vlan_hwaccel_get_tag(skb, tag);