Sometimes these functions are backported in the kernel, add the backports_ prefix to prevent the names from colliding.
Signed-off-by: Hauke Mehrtens <[email protected]> --- backport/backport-include/linux/netdevice.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/backport/backport-include/linux/netdevice.h b/backport/backport-include/linux/netdevice.h index f97e9e1..3d6b7b3 100644 --- a/backport/backport-include/linux/netdevice.h +++ b/backport/backport-include/linux/netdevice.h @@ -157,34 +157,40 @@ static inline int ndo_do_ioctl(struct net_device *dev, */ #ifndef CONFIG_BQL #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,26)) +#define netdev_tx_sent_queue LINUX_BACKPORT(netdev_tx_sent_queue) static inline void netdev_tx_sent_queue(struct netdev_queue *dev_queue, unsigned int bytes) { } #endif +#define netdev_sent_queue LINUX_BACKPORT(netdev_sent_queue) static inline void netdev_sent_queue(struct net_device *dev, unsigned int bytes) { } #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,26)) +#define netdev_tx_completed_queue LINUX_BACKPORT(netdev_tx_completed_queue) static inline void netdev_tx_completed_queue(struct netdev_queue *dev_queue, unsigned pkts, unsigned bytes) { } #endif +#define netdev_completed_queue LINUX_BACKPORT(netdev_completed_queue) static inline void netdev_completed_queue(struct net_device *dev, unsigned pkts, unsigned bytes) { } #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,26)) +#define netdev_tx_reset_queue LINUX_BACKPORT(netdev_tx_reset_queue) static inline void netdev_tx_reset_queue(struct netdev_queue *q) { } #endif +#define netdev_reset_queue LINUX_BACKPORT(netdev_reset_queue) static inline void netdev_reset_queue(struct net_device *dev_queue) { } -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe backports" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
