9 files changed, 13 insertions, 13 deletions

diff --git a/drivers/net/wireless/cisco/airo.c b/drivers/net/wireless/cisco/airo.c
index 4bd9e2b97e86..55456f750229 100644
--- a/drivers/net/wireless/cisco/airo.c
+++ b/drivers/net/wireless/cisco/airo.c
@@ -2026,7 +2026,7 @@ static int mpi_send_packet (struct net_device *dev)
         } else {
                 *payloadLen = cpu_to_le16(len - sizeof(etherHead));
 
-                dev->trans_start = jiffies;
+                netif_trans_update(dev);
 
                 /* copy data into airo dma buffer */
                 memcpy(sendbuf, buffer, len);
@@ -2107,7 +2107,7 @@ static void airo_end_xmit(struct net_device *dev) {
 
         i = 0;
         if ( status == SUCCESS ) {
-                dev->trans_start = jiffies;
+                netif_trans_update(dev);
                 for (; i < MAX_FIDS / 2 && (priv->fids[i] & 0xffff0000); i++);
         } else {
                 priv->fids[fid] &= 0xffff;
@@ -2174,7 +2174,7 @@ static void airo_end_xmit11(struct net_device *dev) {
 
         i = MAX_FIDS / 2;
         if ( status == SUCCESS ) {
-                dev->trans_start = jiffies;
+                netif_trans_update(dev);
                 for (; i < MAX_FIDS && (priv->fids[i] & 0xffff0000); i++);
         } else {
                 priv->fids[fid] &= 0xffff;
diff --git a/drivers/net/wireless/intel/ipw2x00/ipw2100.c b/drivers/net/wireless/intel/ipw2x00/ipw2100.c
index e1e42ed6c412..bfa542c8d6f1 100644
--- a/drivers/net/wireless/intel/ipw2x00/ipw2100.c
+++ b/drivers/net/wireless/intel/ipw2x00/ipw2100.c
@@ -2954,7 +2954,7 @@ static int __ipw2100_tx_process(struct ipw2100_priv *priv)
 
                 /* A packet was processed by the hardware, so update the
                  * watchdog */
-                priv->net_dev->trans_start = jiffies;
+                netif_trans_update(priv->net_dev);
 
                 break;
 
diff --git a/drivers/net/wireless/intel/ipw2x00/ipw2200.c b/drivers/net/wireless/intel/ipw2x00/ipw2200.c
index dac13cf42e9f..5adb7cefb2fe 100644
--- a/drivers/net/wireless/intel/ipw2x00/ipw2200.c
+++ b/drivers/net/wireless/intel/ipw2x00/ipw2200.c
@@ -7707,7 +7707,7 @@ static void ipw_handle_data_packet(struct ipw_priv *priv,
         struct ipw_rx_packet *pkt = (struct ipw_rx_packet *)rxb->skb->data;
 
         /* We received data from the HW, so stop the watchdog */
-        dev->trans_start = jiffies;
+        netif_trans_update(dev);
 
         /* We only process data packets if the
          * interface is open */
@@ -7770,7 +7770,7 @@ static void ipw_handle_data_packet_monitor(struct ipw_priv *priv,
         unsigned short len = le16_to_cpu(pkt->u.frame.length);
 
         /* We received data from the HW, so stop the watchdog */
-        dev->trans_start = jiffies;
+        netif_trans_update(dev);
 
         /* We only process data packets if the
          * interface is open */
@@ -7952,7 +7952,7 @@ static void ipw_handle_promiscuous_rx(struct ipw_priv *priv,
                 return;
 
         /* We received data from the HW, so stop the watchdog */
-        dev->trans_start = jiffies;
+        netif_trans_update(dev);
 
         if (unlikely((len + IPW_RX_FRAME_SIZE) > skb_tailroom(rxb->skb))) {
                 dev->stats.rx_errors++;
diff --git a/drivers/net/wireless/intersil/hostap/hostap_hw.c b/drivers/net/wireless/intersil/hostap/hostap_hw.c
index 515aa3f993f3..a8a9bd8e176a 100644
--- a/drivers/net/wireless/intersil/hostap/hostap_hw.c
+++ b/drivers/net/wireless/intersil/hostap/hostap_hw.c
@@ -1794,7 +1794,7 @@ static int prism2_transmit(struct net_device *dev, int idx)
                 netif_wake_queue(dev);
                 return -1;
         }
-        dev->trans_start = jiffies;
+        netif_trans_update(dev);
 
         /* Since we did not wait for command completion, the card continues
          * to process on the background and we will finish handling when
diff --git a/drivers/net/wireless/intersil/orinoco/main.c b/drivers/net/wireless/intersil/orinoco/main.c
index 7b5c554323c7..7afe2004e930 100644
--- a/drivers/net/wireless/intersil/orinoco/main.c
+++ b/drivers/net/wireless/intersil/orinoco/main.c
@@ -1794,7 +1794,7 @@ void orinoco_reset(struct work_struct *work)
                         printk(KERN_ERR "%s: orinoco_reset: Error %d reenabling card\n",
                                dev->name, err);
                 } else
-                        dev->trans_start = jiffies;
+                        netif_trans_update(dev);
         }
 
         orinoco_unlock_irq(priv);
diff --git a/drivers/net/wireless/intersil/orinoco/orinoco_usb.c b/drivers/net/wireless/intersil/orinoco/orinoco_usb.c
index f2cd513d54b2..56f109bc8394 100644
--- a/drivers/net/wireless/intersil/orinoco/orinoco_usb.c
+++ b/drivers/net/wireless/intersil/orinoco/orinoco_usb.c
@@ -1275,7 +1275,7 @@ static netdev_tx_t ezusb_xmit(struct sk_buff *skb, struct net_device *dev)
                 goto busy;
         }
 
-        dev->trans_start = jiffies;
+        netif_trans_update(dev);
         stats->tx_bytes += skb->len;
         goto ok;
 
diff --git a/drivers/net/wireless/marvell/mwifiex/init.c b/drivers/net/wireless/marvell/mwifiex/init.c
index 517653b3adab..78c532f0d286 100644
--- a/drivers/net/wireless/marvell/mwifiex/init.c
+++ b/drivers/net/wireless/marvell/mwifiex/init.c
@@ -317,7 +317,7 @@ void mwifiex_set_trans_start(struct net_device *dev)
         for (i = 0; i < dev->num_tx_queues; i++)
                 netdev_get_tx_queue(dev, i)->trans_start = jiffies;
 
-        dev->trans_start = jiffies;
+        netif_trans_update(dev);
 }
 
 /*
diff --git a/drivers/net/wireless/wl3501_cs.c b/drivers/net/wireless/wl3501_cs.c
index 99de07d14939..13fd734b61ec 100644
--- a/drivers/net/wireless/wl3501_cs.c
+++ b/drivers/net/wireless/wl3501_cs.c
@@ -1287,7 +1287,7 @@ static void wl3501_tx_timeout(struct net_device *dev)
                 printk(KERN_ERR "%s: Error %d resetting card on Tx timeout!\n",
                        dev->name, rc);
         else {
-                dev->trans_start = jiffies; /* prevent tx timeout */
+                netif_trans_update(dev); /* prevent tx timeout */
                 netif_wake_queue(dev);
         }
 }
diff --git a/drivers/net/wireless/zydas/zd1201.c b/drivers/net/wireless/zydas/zd1201.c
index 6f5c793a7855..dea049b2556f 100644
--- a/drivers/net/wireless/zydas/zd1201.c
+++ b/drivers/net/wireless/zydas/zd1201.c
@@ -845,7 +845,7 @@ static void zd1201_tx_timeout(struct net_device *dev)
         usb_unlink_urb(zd->tx_urb);
         dev->stats.tx_errors++;
         /* Restart the timeout to quiet the watchdog: */
-        dev->trans_start = jiffies; /* prevent tx timeout */
+        netif_trans_update(dev); /* prevent tx timeout */
 }
 
 static int zd1201_set_mac_address(struct net_device *dev, void *p)