Repository : ssh://git@open-mesh.org/openwrt-feed-devel

On branch : master

commit a1e5bfb5a6dc26f3e480bad6592dc5778696581a Author: Sven Eckelmann sven@narfation.org Date: Fri Feb 22 20:19:42 2019 +0100

batman-adv-devel: Drop compat-hack for skb_put*

skb_put* is already defined by the mac80211's backports and doesn't have to be redefined in the compat-hacks.h.

Signed-off-by: Sven Eckelmann sven@narfation.org

a1e5bfb5a6dc26f3e480bad6592dc5778696581a batman-adv-devel/src/compat-hacks.h | 42 ------------------------------------- 1 file changed, 42 deletions(-)

diff --git a/batman-adv-devel/src/compat-hacks.h b/batman-adv-devel/src/compat-hacks.h index c2e6e31..321ad6d 100644 --- a/batman-adv-devel/src/compat-hacks.h +++ b/batman-adv-devel/src/compat-hacks.h @@ -138,48 +138,6 @@ batadv_ethtool_get_link_ksettings(struct net_device *dev,

#endif /* < KERNEL_VERSION(4, 11, 9) */

-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 13, 0) - -static inline void *batadv_skb_put(struct sk_buff *skb, unsigned int len) -{ - return (void *)skb_put(skb, len); -} -#ifdef skb_put -#undef skb_put -#endif - -#define skb_put batadv_skb_put - -static inline void *batadv_skb_put_zero(struct sk_buff *skb, unsigned int len) -{ - void *tmp = skb_put(skb, len); - - memset(tmp, 0, len); - - return tmp; -} -#ifdef skb_put_zero -#undef skb_put_zero -#endif - -#define skb_put_zero batadv_skb_put_zero - -static inline void *batadv_skb_put_data(struct sk_buff *skb, const void *data, - unsigned int len) -{ - void *tmp = skb_put(skb, len); - - memcpy(tmp, data, len); - - return tmp; -} -#ifdef skb_put_data -#undef skb_put_data -#endif - -#define skb_put_data batadv_skb_put_data - -#endif /* < KERNEL_VERSION(4, 13, 0) */

#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)