[PATCH linux1394-2.6.git 09/15] ieee1394: eth1394: omit useless set_mac_address callback

[Stefan Richter]

We can't reconfigure the MAC address, hence we don't need the callback.

Signed-off-by: Stefan Richter <[EMAIL PROTECTED]>
---
 drivers/ieee1394/eth1394.c |   14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

Index: linux/drivers/ieee1394/eth1394.c
===================================================================
--- linux.orig/drivers/ieee1394/eth1394.c
+++ linux/drivers/ieee1394/eth1394.c
@@ -178,8 +178,6 @@ static int ether1394_header_cache(struct
 static void ether1394_header_cache_update(struct hh_cache *hh,
                                          struct net_device *dev,
                                          unsigned char *haddr);
-static int ether1394_mac_addr(struct net_device *dev, void *p);
-
 static int ether1394_tx(struct sk_buff *skb, struct net_device *dev);
 static void ether1394_iso(struct hpsb_iso *iso);
 
@@ -516,7 +514,7 @@ static void ether1394_init_dev(struct ne
        dev->hard_header_cache  = ether1394_header_cache;
        dev->header_cache_update= ether1394_header_cache_update;
        dev->hard_header_parse  = ether1394_header_parse;
-       dev->set_mac_address    = ether1394_mac_addr;
+       dev->set_mac_address    = NULL;
        SET_ETHTOOL_OPS(dev, &ethtool_ops);
 
        /* Some constants */
@@ -758,16 +756,6 @@ static void ether1394_header_cache_updat
        memcpy((u8 *)hh->hh_data + 16 - ETH1394_HLEN, haddr, dev->addr_len);
 }
 
-static int ether1394_mac_addr(struct net_device *dev, void *p)
-{
-       if (netif_running(dev))
-               return -EBUSY;
-
-       /* Not going to allow setting the MAC address, we really need to use
-        * the real one supplied by the hardware */
-        return -EINVAL;
-}
-
 /******************************************
  * Datagram reception code
  ******************************************/

-- 
Stefan Richter
-=====-=-=== -=-- ---=-
http://arcgraph.de/sr/

-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html