  		nx_nic_print4(adapter, "Multicast address count mismatch\n");
  	}
  
-@@ -5532,7 +5532,7 @@ int unm_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
- 	spin_lock(&adapter->tx_lock);
- 	if (!netif_carrier_ok(netdev)) {
- 		if (!adapter->testCtx.loopback_start)
--			goto drop_packet;	
-+			goto drop_packet;
- 	}
- 
- 	producer = adapter->cmdProducer;
-@@ -5848,7 +5848,7 @@ static int unm_nic_check_temp(struct unm_adapter_s *adapter)
- 	temp_val = nx_get_temp_val(temp);
- 	if (adapter->temp == 0) {
- // initialize value to normal, else if already in warn temp range, no msg comes out
--		adapter->temp = NX_TEMP_NORMAL;  	
-+		adapter->temp = NX_TEMP_NORMAL;
- 	}
- 
- 	if (temp_state == NX_TEMP_PANIC) {
-@@ -5958,7 +5958,7 @@ int nx_reset_netq_rx_queues( struct net_device *netdev)
- 		{
- 			ctx_id = nx_nic_multictx_alloc_rx_ctx(netdev);
- 			if(ctx_id > 0)
--				nx_nic_multictx_set_rx_rule(netdev, ctx_id, 
-+				nx_nic_multictx_set_rx_rule(netdev, ctx_id,
- 						(u8 *) (&adapter->nx_dev->saved_rules[ctx_id].arg.m.mac));
- 			num_of_queues = num_of_queues & (num_of_queues - 1);
- 		}
-@@ -5996,7 +5996,7 @@ int netxen_nic_attach_all_ports(struct unm_adapter_s *adapter)
- 			continue;
- #else
- 	list_for_each_entry(dev,&adapter->pdev->bus->devices,bus_list)  {
--#endif		
-+#endif
- 		struct net_device *curr_netdev;
- 		struct unm_adapter_s *curr_adapter;
- 		curr_netdev = pci_get_drvdata(dev);
-@@ -6157,7 +6157,7 @@ static void nx_set_dev_ready(struct unm_adapter_s *adapter)
- 	api_unlock(adapter);
- }
- 
--#if (!defined(ESX) && defined(CONFIG_PCIEAER)) 
-+#if (!defined(ESX) && defined(CONFIG_PCIEAER))
- static void nx_clear_aer_state(struct unm_adapter_s *adapter)
- {
- 	u32 dev_state;
-@@ -6227,7 +6227,7 @@ static int nx_dev_request_reset(struct unm_adapter_s *adapter)
- 	dev_state = NXRD32(adapter, UNM_FW_RESET);
- 	if (dev_state == NX_NIC_DEV_RESET) {
- 		api_unlock(adapter);
--		return 0;	
-+		return 0;
- 	}
- 
- 	if (dev_state != NX_NIC_DEV_READY) {
-@@ -6316,8 +6316,8 @@ static void unm_watchdog_task_fw_reset(TASK_PARAM adapid)
- 				      adapter->fw_alive_failures);
- 
- 			if (nx_dev_request_reset(adapter))
--				goto out;	
--				
-+				goto out;
-+
- 			failure_type = NXRD32(adapter, UNM_PEG_HALT_STATUS1);
- 			return_address = NXRD32(adapter, UNM_PEG_HALT_STATUS2);
- 			nx_nic_print3(adapter,"Firmware hang detected. "
-@@ -6340,14 +6340,14 @@ static void unm_watchdog_task_fw_reset(TASK_PARAM adapid)
- 				nx_nic_print3(adapter,"\nFatal Error.");
-                                 nx_nic_print3(adapter,"\nPlease unload and load the driver.\n");
- 				nx_set_dev_failed(adapter);
--				goto out2;		
-+				goto out2;
- 			}
- 			else {
- 				netxen_nic_detach_all_ports(adapter, 0);
- 				rv = netxen_nic_restart_fw(adapter);
- 				if(!rv)
- 					netxen_nic_attach_all_ports(adapter);
--				
-+
- 			}
- 			nx_set_dev_ready(adapter);
- 		}
-@@ -6497,7 +6497,7 @@ static int nx_nic_fw40_change_mtu(struct net_device *netdev, int new_mtu)
- 				      "max MTU\n");
- 			return (-EIO);
- 		}
--	} 
-+	}
- 
- 	if ((NXRD32(adapter, UNM_CRB_I2C0 + 0x1c) == NX_SSID_NC375T) &&
- 			(new_mtu > 1500)) {
-@@ -7255,7 +7255,7 @@ static inline void unm_process_rcv(struct unm_adapter_s *adapter,
- 			              "captured offloaded skb %p\n", __FUNCTION__, skb);
- 		        kfree_skb(skb);
- 		        goto packet_done;
--		}	
-+		}
- 	}
- 	if ((desc->body[0] & NX_PROT_SHIFT_VAL(NX_PROT_MASK)) ==
- 	     	NX_PROT_SHIFT_VAL(NX_PROT_NIC_ICMP) &&
-@@ -7293,7 +7293,7 @@ static inline void unm_process_rcv(struct unm_adapter_s *adapter,
- 
- 	if (ret == NET_RX_SUCCESS)
- 		adapter->stats.uphappy++;
--	
-+
- 
- 	netdev->last_rx = jiffies;
- #ifndef ESX
-@@ -7685,7 +7685,7 @@ static inline void unm_process_lro(struct unm_adapter_s *adapter,
- 		lro_adjust_head_skb(head_skb, last_skb, data_length,
- 				    &desc->lro_hdr);
- 	}
--	
-+
- 	NX_ADJUST_SMALL_PKT_LEN(head_skb);
- 
- 	length = head_skb->len;
-@@ -7743,7 +7743,7 @@ static int nx_post_rx_descriptors(struct unm_adapter_s *adapter,
- 			}
- 		}
- 
--		list_del(&buffer->link);	
-+		list_del(&buffer->link);
- 
- 		/* make a rcv descriptor  */
- 		pdesc = ((rcvDesc_t *) (nxhal_rds_ring->host_addr)) + producer;
-@@ -7981,7 +7981,7 @@ unm_process_rcv_ring(struct unm_adapter_s *adapter,
- 					 */
- 					break;
- 				}
--				
-+
- 				desc->owner = STATUS_OWNER_PHANTOM;
- 
- 				for (i = 0; i < (cnt - 2); i++) {
-@@ -8905,7 +8905,7 @@ static int nx_nic_attach_func(struct pci_dev *pdev)
- }
- 
- 
--#if (!defined(ESX) && defined(CONFIG_PCIEAER)) 
-+#if (!defined(ESX) && defined(CONFIG_PCIEAER))
- static pci_ers_result_t nx_nic_io_error_detected(struct pci_dev *pdev,
- 						pci_channel_state_t state)
- {
-@@ -8917,7 +8917,7 @@ static pci_ers_result_t nx_nic_io_error_detected(struct pci_dev *pdev,
- 
- 	if (nx_dev_request_aer(adapter))
- 		return PCI_ERS_RESULT_RECOVERED;
--	
-+
- 	nx_nic_detach_func(adapter);
- 
- 	pci_disable_device(pdev);
-@@ -8976,7 +8976,7 @@ static int unm_nic_resume(struct pci_dev *pdev)
- 
- #endif /* (!defined(ESX) && defined(CONFIG_PM)) */
- 
--#if (!defined(ESX) && defined(CONFIG_PCIEAER)) 
-+#if (!defined(ESX) && defined(CONFIG_PCIEAER))
- static struct pci_error_handlers nx_nic_err_handler = {
- 	.error_detected = nx_nic_io_error_detected,
- 	.slot_reset = nx_nic_io_slot_reset,
-@@ -8993,7 +8993,7 @@ static struct pci_driver unm_driver = {
- 	.suspend = unm_nic_suspend,
- 	.resume = unm_nic_resume,
- #endif
--#if (!defined(ESX) && defined(CONFIG_PCIEAER)) 
-+#if (!defined(ESX) && defined(CONFIG_PCIEAER))
- 	.err_handler = &nx_nic_err_handler
- #endif
- 
-@@ -9021,7 +9021,7 @@ static int __init unm_init_module(void)
- 	nx_verify_module_params();
- 
- 	err = PCI_MODULE_INIT(&unm_driver);
--	
-+
- 	if (err) {
- 
- 		unm_cleanup_proc_drv_entries();
 diff --git a/nx_xport/nx_pci_xport.c b/nx_xport/nx_pci_xport.c
 index 82113e3..ffd97dc 100644
 --- a/nx_xport/nx_pci_xport.c
 +++ b/nx_xport/nx_pci_xport.c
-@@ -1,25 +1,25 @@
- /*
-  * Copyright (C) 2003 - 2009 NetXen, Inc.
-  * All rights reserved.
-- * 
-+ *
-  * This program is free software; you can redistribute it and/or
-  * modify it under the terms of the GNU General Public License
-  * as published by the Free Software Foundation; either version 2
-  * of the License, or (at your option) any later version.
-- * 
-+ *
-  * This program is distributed in the hope that it will be useful, but
-  * WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * GNU General Public License for more details.
-- * 
-+ *
-  * You should have received a copy of the GNU General Public License
-  * along with this program; if not, write to the Free Software
-  * Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-  * MA 02111-1307, USA.
-- * 
-+ *
-  * The full GNU General Public License is included in this distribution
-  * in the file called LICENSE.
-- * 
-+ *
-  * Contact Information:
-  * licensing@netxen.com
-  * NetXen, Inc.
-@@ -162,7 +162,7 @@ static void unm_pci_release_regions(struct pci_dev *pdev);
- 
- static int nx_pci_open(struct inode *inode, struct file *file);
- static int nx_pci_release(struct inode *inode, struct file *file);
--static void nx_sort_adapters(void);	
-+static void nx_sort_adapters(void);
- 
- /*  PCI Device ID Table  */
- #define NETXEN_PCI_ID(device_id)   PCI_DEVICE(PCI_VENDOR_ID_NX, device_id)
 @@ -185,7 +185,7 @@ static struct file_operations unm_pci_fops = {
  	llseek: 	NULL,
  	owner:          THIS_MODULE,

index 04507f0..4668e68 100644
--- a/nx_xport/nx_xport_tool.c
+++ b/nx_xport/nx_xport_tool.c
@@ -1,25 +1,25 @@
 /*
  * Copyright (C) 2003 - 2009 NetXen, Inc.
  * All rights reserved.
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston,
  * MA 02111-1307, USA.
- * 
+ *
  * The full GNU General Public License is included in this distribution
  * in the file called LICENSE.
- * 
+ *
  * Contact Information:
  * licensing@netxen.com
  * NetXen, Inc.
@@ -29,25 +29,25 @@
 /*
  * Copyright (C) 2003 - 2009 NetXen, Inc.
  * All rights reserved.
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston,
  * MA 02111-1307, USA.
- * 
+ *
  * The full GNU General Public License is included in this distribution
  * in the file called LICENSE.
- * 
+ *
  * Contact Information:
  * licensing@netxen.com
  * NetXen, Inc.
@@ -61,6 +61,7 @@
 #include <asm/types.h>
 #include <asm/uaccess.h>

index ca1c527..0d4bc0e 100644
--- a/driver/unm_nic_ethtool.c
+++ b/driver/unm_nic_ethtool.c
@@ -1212,9 +1212,18 @@ static int unm_nic_intr_test(struct net_device *netdev)
 }
 #endif
