Re: 2.6.7-rc2-mm1 - bk-netdev.patch e1000_ethtool.c doesn't build

The patch bk-netdev.patch in 2.6.7-rc2-mm1 doesn't compile.


It contains the following change, which creates two identical e1000_gstrings_stats[]
opening declaration lines in a row, and many many gcc errors, starting with:

drivers/net/e1000/e1000_ethtool.c:57: error: parse error before "static"

diff -Nru a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c

--- a/drivers/net/e1000/e1000_ethtool.c 2004-05-31 16:18:26 -07:00
+++ b/drivers/net/e1000/e1000_ethtool.c 2004-05-31 16:18:26 -07:00

@@ -54,6 +54,7 @@
 #define E1000_STAT(m) sizeof(((struct e1000_adapter *)0)->m), \
                      offsetof(struct e1000_adapter, m)
 static const struct e1000_stats e1000_gstrings_stats[] = {
+static const struct e1000_stats e1000_gstrings_stats[] = {
 	{ "rx_packets", E1000_STAT(net_stats.rx_packets) },
 	{ "tx_packets", E1000_STAT(net_stats.tx_packets) },
 	{ "rx_bytes", E1000_STAT(net_stats.rx_bytes) },

There may or may not be other errors past this - I have not gone there yet.

-- 
                          I won't rest till it's the best ...
                          Programmer, Linux Scalability
                          Paul Jackson [off-list ref] 1.650.933.1373

There may or may not be other errors past this ...

There are other errors - many more such duplicated and near-duplicated
lines, such as for one example the following.  Someone's shotgun
misfired and hit someone's foot.

@@ -1440,8 +1554,10 @@

 static void
 e1000_get_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
+e1000_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
 {
 	struct e1000_adapter *adapter = netdev->priv;
+	struct e1000_adapter *adapter = netdev_priv(dev);
 	struct e1000_hw *hw = &adapter->hw;

 	switch(adapter->hw.device_id) {

-- 
                          I won't rest till it's the best ...
                          Programmer, Linux Scalability
                          Paul Jackson <pj@sgi.com> 1.650.933.1373