diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/if_vlan.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h index d69f0577a319..1b5dbc2711f9 100644 --- a/include/linux/if_vlan.h +++ b/include/linux/if_vlan.h | |||
@@ -347,13 +347,11 @@ static inline struct sk_buff *__vlan_put_tag(struct sk_buff *skb, | |||
347 | * | 347 | * |
348 | * Puts the VLAN TCI in @skb->vlan_tci and lets the device do the rest | 348 | * Puts the VLAN TCI in @skb->vlan_tci and lets the device do the rest |
349 | */ | 349 | */ |
350 | static inline struct sk_buff *__vlan_hwaccel_put_tag(struct sk_buff *skb, | 350 | static inline void __vlan_hwaccel_put_tag(struct sk_buff *skb, |
351 | __be16 vlan_proto, | 351 | __be16 vlan_proto, u16 vlan_tci) |
352 | u16 vlan_tci) | ||
353 | { | 352 | { |
354 | skb->vlan_proto = vlan_proto; | 353 | skb->vlan_proto = vlan_proto; |
355 | skb->vlan_tci = VLAN_TAG_PRESENT | vlan_tci; | 354 | skb->vlan_tci = VLAN_TAG_PRESENT | vlan_tci; |
356 | return skb; | ||
357 | } | 355 | } |
358 | 356 | ||
359 | /** | 357 | /** |
@@ -368,7 +366,8 @@ static inline struct sk_buff *vlan_put_tag(struct sk_buff *skb, | |||
368 | __be16 vlan_proto, u16 vlan_tci) | 366 | __be16 vlan_proto, u16 vlan_tci) |
369 | { | 367 | { |
370 | if (vlan_hw_offload_capable(skb->dev->features, vlan_proto)) { | 368 | if (vlan_hw_offload_capable(skb->dev->features, vlan_proto)) { |
371 | return __vlan_hwaccel_put_tag(skb, vlan_proto, vlan_tci); | 369 | __vlan_hwaccel_put_tag(skb, vlan_proto, vlan_tci); |
370 | return skb; | ||
372 | } else { | 371 | } else { |
373 | return __vlan_put_tag(skb, vlan_proto, vlan_tci); | 372 | return __vlan_put_tag(skb, vlan_proto, vlan_tci); |
374 | } | 373 | } |