Messages in this thread Patch in this message | | | Date | Wed, 25 Feb 2004 19:21:16 -0800 | Subject | [PATCH 2.6 IrDA] txqueue_empty | From | Jean Tourrilhes <> |
| |
irXXX_txqueue_empty.diff : ~~~~~~~~~~~~~~~~~~~~~~~~ <Patch from Stephen Hemminger> o [FEATURE] optimise irda_device_txqueue_empty by making inline
diff -Nru a/include/net/irda/irda_device.h b/include/net/irda/irda_device.h --- a/include/net/irda/irda_device.h Mon Feb 23 11:00:44 2004 +++ b/include/net/irda/irda_device.h Mon Feb 23 11:00:44 2004 @@ -45,6 +45,7 @@ #include <linux/skbuff.h> /* struct sk_buff */ #include <linux/irda.h> +#include <net/pkt_sched.h> #include <net/irda/irda.h> #include <net/irda/qos.h> /* struct qos_info */ #include <net/irda/irqueue.h> /* irda_queue_t */ @@ -219,7 +220,10 @@ int irda_device_is_receiving(struct net_device *dev); /* Interface for internal use */ -int irda_device_txqueue_empty(struct net_device *dev); +static inline int irda_device_txqueue_empty(const struct net_device *dev) +{ + return (skb_queue_len(&dev->qdisc->q) == 0); +} int irda_device_set_raw_mode(struct net_device* self, int status); int irda_device_set_dtr_rts(struct net_device *dev, int dtr, int rts); int irda_device_change_speed(struct net_device *dev, __u32 speed); diff -Nru a/net/irda/irda_device.c b/net/irda/irda_device.c --- a/net/irda/irda_device.c Mon Feb 23 11:00:44 2004 +++ b/net/irda/irda_device.c Mon Feb 23 11:00:44 2004 @@ -47,8 +47,6 @@ #include <asm/dma.h> #include <asm/io.h> -#include <net/pkt_sched.h> - #include <net/irda/irda_device.h> #include <net/irda/irlap.h> #include <net/irda/timer.h> @@ -403,22 +401,6 @@ struct net_device *alloc_irdadev(int sizeof_priv) { return alloc_netdev(sizeof_priv, "irda%d", irda_device_setup); -} - - -/* - * Function irda_device_txqueue_empty (dev) - * - * Check if there is still some frames in the transmit queue for this - * device. Maybe we should use: q->q.qlen == 0. - * - */ -int irda_device_txqueue_empty(struct net_device *dev) -{ - if (skb_queue_len(&dev->qdisc->q)) - return FALSE; - - return TRUE; } /* - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |