aoe: allocate unused request_queue for sysfs

[safe/jmp/linux-2.6] / drivers / staging / sxg / sxg_ethtool.c

diff --git a/drivers/staging/sxg/sxg_ethtool.c b/drivers/staging/sxg/sxg_ethtool.c
index 8c710f4..ad89cb8 100644 (file)
--- a/drivers/staging/sxg/sxg_ethtool.c
+++ b/drivers/staging/sxg/sxg_ethtool.c
@@ -221,7 +221,7 @@ static int sxg_nic_get_settings(struct net_device *netdev,
 static u32 sxg_nic_get_rx_csum(struct net_device *netdev)
 {
        struct adapter_t *adapter = netdev_priv(netdev);
-       return ((adapter->flags & SXG_RCV_IP_CSUM_ENABLED) ||
+       return ((adapter->flags & SXG_RCV_IP_CSUM_ENABLED) &&
                 (adapter->flags & SXG_RCV_TCP_CSUM_ENABLED));
 }
 
@@ -232,9 +232,10 @@ static int sxg_nic_set_rx_csum(struct net_device *netdev, u32 data)
                adapter->flags |= SXG_RCV_IP_CSUM_ENABLED;
        else
                adapter->flags &= ~SXG_RCV_IP_CSUM_ENABLED;
-
-       /* Reset the card here (call the reset functions .. currently unavailable)*/
-
+       /*
+        * We dont need to write to the card to do checksums.
+        * It does it anyways.
+        */
        return 0;
 }
 
@@ -277,7 +278,7 @@ static int sxg_nic_get_eeprom(struct net_device *netdev,
                  * Get out of here
                  */
                 printk(KERN_ERR"%s : Could not allocate memory for reading \
-                                EEPROM\n", __FUNCTION__);
+                                EEPROM\n", __func__);
                 return -ENOMEM;
         }