diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2013-11-30 18:12:01 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2013-11-30 22:37:13 +0100 |
| commit | dd6ddf61eae9b7da545e2bc4ff714b7530ba6e8b (patch) | |
| tree | 68d96648c43cab16b342df254cdcfd2e8f9a0348 | |
| parent | 2bc07419d7fc6488f8f13f66c388217441407106 (diff) | |
backports: add backport_ prefix in front of BQL functions
Upstream commit: 351423240e69e385b7433adb555b739e05af3def
Sometimes these functions are backported in the kernel, add the
backports_ prefix to prevent the names from colliding.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
| -rw-r--r-- | backport/backport-include/linux/netdevice.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/backport/backport-include/linux/netdevice.h b/backport/backport-include/linux/netdevice.h index 631fc849..6c3569f4 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) { } |