Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=78f710dc186f34fb14d8b22a33749a56013e7b85
Commit:     78f710dc186f34fb14d8b22a33749a56013e7b85
Parent:     b3bd6fe96da32e4e818b51826f04349cee9b15ba
Author:     Masakazu Mokuno <[EMAIL PROTECTED]>
AuthorDate: Fri Jul 20 17:28:59 2007 +0900
Committer:  Jeff Garzik <[EMAIL PROTECTED]>
CommitDate: Tue Jul 24 16:28:39 2007 -0400

    ps3: removed conditional ethtool support
    
    Removed conditional ethtool support.  Always enabled.
    
    Signed-off-by: Masakazu Mokuno <[EMAIL PROTECTED]>
    Signed-off-by: Jeff Garzik <[EMAIL PROTECTED]>
---
 drivers/net/ps3_gelic_net.c |    4 ----
 drivers/net/ps3_gelic_net.h |    2 --
 2 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/drivers/net/ps3_gelic_net.c b/drivers/net/ps3_gelic_net.c
index 143d7bd..549e69b 100644
--- a/drivers/net/ps3_gelic_net.c
+++ b/drivers/net/ps3_gelic_net.c
@@ -1160,7 +1160,6 @@ alloc_tx_failed:
        return -ENOMEM;
 }
 
-#ifdef GELIC_NET_ETHTOOL
 static void gelic_net_get_drvinfo (struct net_device *netdev,
                                   struct ethtool_drvinfo *info)
 {
@@ -1280,7 +1279,6 @@ static struct ethtool_ops gelic_net_ethtool_ops = {
        .get_rx_csum    = gelic_net_get_rx_csum,
        .set_rx_csum    = gelic_net_set_rx_csum,
 };
-#endif
 
 /**
  * gelic_net_tx_timeout_task - task scheduled by the watchdog timeout
@@ -1348,9 +1346,7 @@ static void gelic_net_setup_netdev_ops(struct net_device 
*netdev)
        /* NAPI */
        netdev->poll = &gelic_net_poll;
        netdev->weight = GELIC_NET_NAPI_WEIGHT;
-#ifdef GELIC_NET_ETHTOOL
        netdev->ethtool_ops = &gelic_net_ethtool_ops;
-#endif
 }
 
 /**
diff --git a/drivers/net/ps3_gelic_net.h b/drivers/net/ps3_gelic_net.h
index 2d14d3e..0bd4434 100644
--- a/drivers/net/ps3_gelic_net.h
+++ b/drivers/net/ps3_gelic_net.h
@@ -28,8 +28,6 @@
 #ifndef _GELIC_NET_H
 #define _GELIC_NET_H
 
-#define GELIC_NET_ETHTOOL               /* use ethtool */
-
 /* descriptors */
 #define GELIC_NET_RX_DESCRIPTORS        128 /* num of descriptors */
 #define GELIC_NET_TX_DESCRIPTORS        128 /* num of descriptors */
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to