stable v5.4.29 breaks wireguard dkms in Ubuntu Focal

[Kamal Mostafa]

Hi Jason, etc.-

This patch from linux-stable v5.4.29 will break our Ubuntu Focal dkms build
of wireguard:

f8c60f7a0051 net: Fix CONFIG_NET_CLS_ACT=n and CONFIG_NFT_FWD_NETDEV={y, m}
build

Like so:

<<DKMSDIR>>/build/wireguard/1.0.20200330/build/compat/compat.h:1029:20:
error: redefinition of 'skb_reset_redirect'
 1029 | static inline void skb_reset_redirect(struct sk_buff *skb)
./include/linux/skbuff.h:4538:20: note: previous definition of
'skb_reset_redirect' was here
 4538 | static inline void skb_reset_redirect(struct sk_buff *skb)

<<DKMSDIR>>/build/wireguard/1.0.20200330/build/compat/compat.h: In function
'skb_reset_redirect':
<<DKMSDIR>>/build/wireguard/1.0.20200330/build/compat/compat.h:1032:2:
error: implicit declaration of function 'skb_reset_tc'


The mainline commit it is based upon ...

2c64605b590e net: Fix CONFIG_NET_CLS_ACT=n and CONFIG_NFT_FWD_NETDEV={y, m}
build

... touches drivers/net/wireguard/queueing.h but that change is (of course)
omitted from the v5.4.29 backport patch.  Will you be fixing wireguard's
compat.h for this?

 -Kamal (Canonical Kernel Team)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20200401/01d40f45/attachment.html>