netdev
[Top] [All Lists]

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

To: Paul Jackson <pj@xxxxxxx>
Subject: Re: 2.6.7-rc2-mm1 - bk-netdev.patch e1000_ethtool.c doesn't build
From: Paul Jackson <pj@xxxxxxx>
Date: Wed, 2 Jun 2004 02:41:18 -0700
Cc: akpm@xxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx, netdev@xxxxxxxxxxx, jgarzik@xxxxxxxxx
In-reply-to: <20040602022130.35a7571d.pj@xxxxxxx>
Organization: SGI
References: <20040601021539.413a7ad7.akpm@xxxxxxxx> <20040602022130.35a7571d.pj@xxxxxxx>
Sender: netdev-bounce@xxxxxxxxxxx
> 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@xxxxxxx> 1.650.933.1373

<Prev in Thread] Current Thread [Next in Thread>