You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

35 lines
1.1 KiB

  1. From 5919cb26c631b1dd77a745a3c546f9d117ed34b3 Mon Sep 17 00:00:00 2001
  2. From: Hauke Mehrtens <hauke@hauke-m.de>
  3. Date: Sat, 23 May 2015 18:12:09 +0200
  4. Subject: [PATCH] datapath: do not add vlan_hwaccel_push_inside() for kernel >=
  5. 3.18.13
  6. The vlan_hwaccel_push_inside() function was backported in this commit
  7. to kernel 3.18.13:
  8. commit a67e2e88342accd49587d9bad72f6dabd7673f7c
  9. Author: Jiri Pirko <jiri@resnulli.us>
  10. Date: Wed Nov 19 14:04:59 2014 +0100
  11. vlan: introduce *vlan_hwaccel_push_inside helpers
  12. [ Upstream commit 5968250c868ceee680aa77395b24e6ddcae17d36 ]
  13. Without this patch compilation breaks on kernel >= 3.18.13
  14. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  15. ---
  16. datapath/linux/compat/include/linux/if_vlan.h | 2 +-
  17. 1 file changed, 1 insertion(+), 1 deletion(-)
  18. --- a/datapath/linux/compat/include/linux/if_vlan.h
  19. +++ b/datapath/linux/compat/include/linux/if_vlan.h
  20. @@ -52,7 +52,7 @@ static inline struct sk_buff *rpl_vlan_i
  21. }
  22. #endif
  23. -#if LINUX_VERSION_CODE < KERNEL_VERSION(3,19,0)
  24. +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,18,13)
  25. /*
  26. * __vlan_hwaccel_push_inside - pushes vlan tag to the payload
  27. * @skb: skbuff to tag