Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=8a62bf7978eaa428e400677d5e5f5441262f79b1
Commit: 8a62bf7978eaa428e400677d5e5f5441262f79b1
Parent: 599bba9647f7813c09bf921c72351609430c8a33
Author: Stefan Richter <[EMAIL PROTECTED]>
AuthorDate: Mon Apr 2 02:19:48 2007 +0200
Committer: Stefan Richter <[EMAIL PROTECTED]>
CommitDate: Mon Apr 30 00:00:31 2007 +0200
ieee1394: eth1394: omit useless set_mac_address callback
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 files changed, 1 insertions(+), 13 deletions(-)
diff --git a/drivers/ieee1394/eth1394.c b/drivers/ieee1394/eth1394.c
index 2d226a3..fc6c7fd 100644
--- a/drivers/ieee1394/eth1394.c
+++ b/drivers/ieee1394/eth1394.c
@@ -167,8 +167,6 @@ static int ether1394_header_cache(struct neighbour *neigh,
struct hh_cache *hh);
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);
@@ -512,7 +510,7 @@ static void ether1394_init_dev(struct net_device *dev)
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, ðtool_ops);
/* Some constants */
@@ -754,16 +752,6 @@ static void ether1394_header_cache_update(struct hh_cache
*hh,
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
******************************************/
-
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
