diff options
| author | David S. Miller <davem@davemloft.net> | 2016-11-15 20:16:14 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-11-15 20:16:14 +0300 |
| commit | 81fea579aa57750bb42ed9de5790c48357435cea (patch) | |
| tree | 0f662099486d53745d3bb4f2d5914875c839b083 /include/linux | |
| parent | c915fe13cbaae5c7aa7b44f367d05addd60c9008 (diff) | |
| parent | 9efdb92d68c726e70066e5b4189c1186c9b6f90c (diff) | |
| download | linux-81fea579aa57750bb42ed9de5790c48357435cea.tar.xz | |
Merge branch 'vxlan-xmit-improvements'
Pravin B Shelar says:
====================
vxlan: xmit improvements.
Following patch series improves vxlan fast path, removes
duplicate code and simplifies vxlan xmit code path.
v2-v3:
Removed unrelated warning fix from patch 2.
rearranged error handling from patch 3
Fixed stats updates in vxlan route lookup in patch 4
v1-v2:
Fix compilation error when IPv6 support is not enabled.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/if_vlan.h | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h index 3319d97d789d..8d5fcd6284ce 100644 --- a/include/linux/if_vlan.h +++ b/include/linux/if_vlan.h @@ -399,22 +399,6 @@ static inline struct sk_buff *__vlan_hwaccel_push_inside(struct sk_buff *skb) skb->vlan_tci = 0; return skb; } -/* - * vlan_hwaccel_push_inside - pushes vlan tag to the payload - * @skb: skbuff to tag - * - * Checks is tag is present in @skb->vlan_tci and if it is, it pushes the - * VLAN tag from @skb->vlan_tci inside to the payload. - * - * Following the skb_unshare() example, in case of error, the calling function - * doesn't have to worry about freeing the original skb. - */ -static inline struct sk_buff *vlan_hwaccel_push_inside(struct sk_buff *skb) -{ - if (skb_vlan_tag_present(skb)) - skb = __vlan_hwaccel_push_inside(skb); - return skb; -} /** * __vlan_hwaccel_put_tag - hardware accelerated VLAN inserting |