1 files changed, 22 insertions, 22 deletions

diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c
index 548c248093b8..d9688bbb9292 100644
--- a/drivers/net/ixgb/ixgb_main.c
+++ b/drivers/net/ixgb/ixgb_main.c
@@ -67,7 +67,7 @@ MODULE_DEVICE_TABLE(pci, ixgb_pci_tbl);
 /* Local Function Prototypes */
 
 int ixgb_up(struct ixgb_adapter *adapter);
-void ixgb_down(struct ixgb_adapter *adapter, boolean_t kill_watchdog);
+void ixgb_down(struct ixgb_adapter *adapter, bool kill_watchdog);
 void ixgb_reset(struct ixgb_adapter *adapter);
 int ixgb_setup_tx_resources(struct ixgb_adapter *adapter);
 int ixgb_setup_rx_resources(struct ixgb_adapter *adapter);
@@ -94,14 +94,14 @@ static struct net_device_stats *ixgb_get_stats(struct net_device *netdev);
 static int ixgb_change_mtu(struct net_device *netdev, int new_mtu);
 static int ixgb_set_mac(struct net_device *netdev, void *p);
 static irqreturn_t ixgb_intr(int irq, void *data);
-static boolean_t ixgb_clean_tx_irq(struct ixgb_adapter *adapter);
+static bool ixgb_clean_tx_irq(struct ixgb_adapter *adapter);
 
 #ifdef CONFIG_IXGB_NAPI
 static int ixgb_clean(struct napi_struct *napi, int budget);
-static boolean_t ixgb_clean_rx_irq(struct ixgb_adapter *adapter,
-                                   int *work_done, int work_to_do);
+static bool ixgb_clean_rx_irq(struct ixgb_adapter *adapter,
+                              int *work_done, int work_to_do);
 #else
-static boolean_t ixgb_clean_rx_irq(struct ixgb_adapter *adapter);
+static bool ixgb_clean_rx_irq(struct ixgb_adapter *adapter);
 #endif
 static void ixgb_alloc_rx_buffers(struct ixgb_adapter *adapter);
 static void ixgb_tx_timeout(struct net_device *dev);
@@ -296,7 +296,7 @@ ixgb_up(struct ixgb_adapter *adapter)
 }
 
 void
-ixgb_down(struct ixgb_adapter *adapter, boolean_t kill_watchdog)
+ixgb_down(struct ixgb_adapter *adapter, bool kill_watchdog)
 {
         struct net_device *netdev = adapter->netdev;
 
@@ -662,7 +662,7 @@ ixgb_close(struct net_device *netdev)
 {
         struct ixgb_adapter *adapter = netdev_priv(netdev);
 
-        ixgb_down(adapter, TRUE);
+        ixgb_down(adapter, true);
 
         ixgb_free_tx_resources(adapter);
         ixgb_free_rx_resources(adapter);
@@ -887,7 +887,7 @@ ixgb_configure_rx(struct ixgb_adapter *adapter)
         IXGB_WRITE_REG(hw, RXDCTL, rxdctl);
 
         /* Enable Receive Checksum Offload for TCP and UDP */
-        if(adapter->rx_csum == TRUE) {
+        if (adapter->rx_csum) {
                 rxcsum = IXGB_READ_REG(hw, RXCSUM);
                 rxcsum |= IXGB_RXCSUM_TUOFL;
                 IXGB_WRITE_REG(hw, RXCSUM, rxcsum);
@@ -1170,7 +1170,7 @@ ixgb_watchdog(unsigned long data)
         }
 
         /* Force detection of hung controller every watchdog period */
-        adapter->detect_tx_hung = TRUE;
+        adapter->detect_tx_hung = true;
 
         /* generate an interrupt to force clean up of any stragglers */
         IXGB_WRITE_REG(&adapter->hw, ICS, IXGB_INT_TXDW);
@@ -1249,7 +1249,7 @@ ixgb_tso(struct ixgb_adapter *adapter, struct sk_buff *skb)
         return 0;
 }
 
-static boolean_t
+static bool
 ixgb_tx_csum(struct ixgb_adapter *adapter, struct sk_buff *skb)
 {
         struct ixgb_context_desc *context_desc;
@@ -1281,10 +1281,10 @@ ixgb_tx_csum(struct ixgb_adapter *adapter, struct sk_buff *skb)
                 if(++i == adapter->tx_ring.count) i = 0;
                 adapter->tx_ring.next_to_use = i;
 
-                return TRUE;
+                return true;
         }
 
-        return FALSE;
+        return false;
 }
 
 #define IXGB_MAX_TXD_PWR        14
@@ -1558,7 +1558,7 @@ ixgb_tx_timeout_task(struct work_struct *work)
                 container_of(work, struct ixgb_adapter, tx_timeout_task);
 
         adapter->tx_timeout_count++;
-        ixgb_down(adapter, TRUE);
+        ixgb_down(adapter, true);
         ixgb_up(adapter);
 }
 
@@ -1605,7 +1605,7 @@ ixgb_change_mtu(struct net_device *netdev, int new_mtu)
         netdev->mtu = new_mtu;
 
         if ((old_max_frame != max_frame) && netif_running(netdev)) {
-                ixgb_down(adapter, TRUE);
+                ixgb_down(adapter, true);
                 ixgb_up(adapter);
         }
 
@@ -1822,7 +1822,7 @@ ixgb_clean(struct napi_struct *napi, int budget)
  * @adapter: board private structure
  **/
 
-static boolean_t
+static bool
 ixgb_clean_tx_irq(struct ixgb_adapter *adapter)
 {
         struct ixgb_desc_ring *tx_ring = &adapter->tx_ring;
@@ -1830,7 +1830,7 @@ ixgb_clean_tx_irq(struct ixgb_adapter *adapter)
         struct ixgb_tx_desc *tx_desc, *eop_desc;
         struct ixgb_buffer *buffer_info;
         unsigned int i, eop;
-        boolean_t cleaned = FALSE;
+        bool cleaned = false;
 
         i = tx_ring->next_to_clean;
         eop = tx_ring->buffer_info[i].next_to_watch;
@@ -1838,7 +1838,7 @@ ixgb_clean_tx_irq(struct ixgb_adapter *adapter)
 
         while(eop_desc->status & IXGB_TX_DESC_STATUS_DD) {
 
-                for(cleaned = FALSE; !cleaned; ) {
+                for (cleaned = false; !cleaned; ) {
                         tx_desc = IXGB_TX_DESC(*tx_ring, i);
                         buffer_info = &tx_ring->buffer_info[i];
 
@@ -1872,7 +1872,7 @@ ixgb_clean_tx_irq(struct ixgb_adapter *adapter)
         if(adapter->detect_tx_hung) {
                 /* detect a transmit hang in hardware, this serializes the
                  * check with the clearing of time_stamp and movement of i */
-                adapter->detect_tx_hung = FALSE;
+                adapter->detect_tx_hung = false;
                 if (tx_ring->buffer_info[eop].dma &&
                    time_after(jiffies, tx_ring->buffer_info[eop].time_stamp + HZ)
                    && !(IXGB_READ_REG(&adapter->hw, STATUS) &
@@ -1942,7 +1942,7 @@ ixgb_rx_checksum(struct ixgb_adapter *adapter,
  * @adapter: board private structure
  **/
 
-static boolean_t
+static bool
 #ifdef CONFIG_IXGB_NAPI
 ixgb_clean_rx_irq(struct ixgb_adapter *adapter, int *work_done, int work_to_do)
 #else
@@ -1956,7 +1956,7 @@ ixgb_clean_rx_irq(struct ixgb_adapter *adapter)
         struct ixgb_buffer *buffer_info, *next_buffer, *next2_buffer;
         uint32_t length;
         unsigned int i, j;
-        boolean_t cleaned = FALSE;
+        bool cleaned = false;
 
         i = rx_ring->next_to_clean;
         rx_desc = IXGB_RX_DESC(*rx_ring, i);
@@ -1990,7 +1990,7 @@ ixgb_clean_rx_irq(struct ixgb_adapter *adapter)
                 next_skb = next_buffer->skb;
                 prefetch(next_skb);
 
-                cleaned = TRUE;
+                cleaned = true;
 
                 pci_unmap_single(pdev,
                                  buffer_info->dma,
@@ -2293,7 +2293,7 @@ static pci_ers_result_t ixgb_io_error_detected (struct pci_dev *pdev,
         struct ixgb_adapter *adapter = netdev_priv(netdev);
 
         if(netif_running(netdev))
-                ixgb_down(adapter, TRUE);
+                ixgb_down(adapter, true);
 
         pci_disable_device(pdev);