tx_pend_list : Holds used Tx buffers waiting to go into the TBD ring
     TAIL modified ipw2100_tx()
-    HEAD modified by X__ipw2100_tx_send_data()
+    HEAD modified by ipw2100_tx_send_data()
 
   msg_free_list : Holds pre-allocated Msg (Command) buffers
     TAIL modified in __ipw2100_tx_process()
 
   msg_pend_list : Holds used Msg buffers waiting to go into the TBD ring
     TAIL modified in ipw2100_hw_send_command()
-    HEAD modified in X__ipw2100_tx_send_commands()
+    HEAD modified in ipw2100_tx_send_commands()
 
   The flow of data on the TX side is as follows:
 
 
 
 /* Pre-decl until we get the code solid and then we can clean it up */
-static void X__ipw2100_tx_send_commands(struct ipw2100_priv *priv);
-static void X__ipw2100_tx_send_data(struct ipw2100_priv *priv);
+static void ipw2100_tx_send_commands(struct ipw2100_priv *priv);
+static void ipw2100_tx_send_data(struct ipw2100_priv *priv);
 static int ipw2100_adapter_setup(struct ipw2100_priv *priv);
 
 static void ipw2100_queues_initialize(struct ipw2100_priv *priv);
        list_add_tail(element, &priv->msg_pend_list);
        INC_STAT(&priv->msg_pend_stat);
 
-       X__ipw2100_tx_send_commands(priv);
-       X__ipw2100_tx_send_data(priv);
+       ipw2100_tx_send_commands(priv);
+       ipw2100_tx_send_data(priv);
 
        spin_unlock_irqrestore(&priv->low_lock, flags);
 
        while (__ipw2100_tx_process(priv) && i < 200) i++;
 
        if (i == 200) {
-               IPW_DEBUG_WARNING(
+               printk(KERN_WARNING DRV_NAME ": "
                       "%s: Driver is running slow (%d iters).\n",
                       priv->net_dev->name, i);
        }
 }
 
 
-static void X__ipw2100_tx_send_commands(struct ipw2100_priv *priv)
+static void ipw2100_tx_send_commands(struct ipw2100_priv *priv)
 {
        struct list_head *element;
        struct ipw2100_tx_packet *packet;
 
 
 /*
- * X__ipw2100_tx_send_data
+ * ipw2100_tx_send_data
  *
  */
-static void X__ipw2100_tx_send_data(struct ipw2100_priv *priv)
+static void ipw2100_tx_send_data(struct ipw2100_priv *priv)
 {
        struct list_head *element;
        struct ipw2100_tx_packet *packet;
                               IPW2100_INTA_TX_TRANSFER);
 
                __ipw2100_tx_complete(priv);
-               X__ipw2100_tx_send_commands(priv);
-               X__ipw2100_tx_send_data(priv);
+               ipw2100_tx_send_commands(priv);
+               ipw2100_tx_send_data(priv);
        }
 
        if (inta & IPW2100_INTA_TX_COMPLETE) {
        list_add_tail(element, &priv->tx_pend_list);
        INC_STAT(&priv->tx_pend_stat);
 
-       X__ipw2100_tx_send_data(priv);
+       ipw2100_tx_send_data(priv);
 
        spin_unlock_irqrestore(&priv->low_lock, flags);
        return 0;