diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2013-11-30 20:54:40 +0100 |
|---|---|---|
| committer | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2013-12-02 11:49:16 +0100 |
| commit | 04ea91263a8d4a343fe678b6d8a2873da294468e (patch) | |
| tree | ee0da50e65fa3cebc41d5cadee154990ae55bdf0 /backport | |
| parent | 67b37bef315c0554b0a6a48f39c69753dcb043de (diff) | |
backports: add backport_ prefix in front of BQL functions
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>
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Diffstat (limited to 'backport')
| -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 f97e9e1f..3d6b7b37 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) { } |