git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fb: change rules for global rules match.
[safe/jmp/linux-2.6]
/
drivers
/
net
/
smc-mca.c
diff --git
a/drivers/net/smc-mca.c
b/drivers/net/smc-mca.c
index
404b80e
..
c791ef7
100644
(file)
--- a/
drivers/net/smc-mca.c
+++ b/
drivers/net/smc-mca.c
@@
-192,6
+192,7
@@
static const struct net_device_ops ultramca_netdev_ops = {
.ndo_get_stats = ei_get_stats,
.ndo_set_multicast_list = ei_set_multicast_list,
.ndo_validate_addr = eth_validate_addr,
.ndo_get_stats = ei_get_stats,
.ndo_set_multicast_list = ei_set_multicast_list,
.ndo_validate_addr = eth_validate_addr,
+ .ndo_set_mac_address = eth_mac_addr,
.ndo_change_mtu = eth_change_mtu,
#ifdef CONFIG_NET_POLL_CONTROLLER
.ndo_poll_controller = ei_poll,
.ndo_change_mtu = eth_change_mtu,
#ifdef CONFIG_NET_POLL_CONTROLLER
.ndo_poll_controller = ei_poll,
@@
-369,7
+370,7
@@
static int __init ultramca_probe(struct device *gen_dev)
outb(reg4, ioaddr + 4);
outb(reg4, ioaddr + 4);
-
gen_dev->driver_data = dev
;
+
dev_set_drvdata(gen_dev, dev)
;
/* The 8390 isn't at the base address, so fake the offset
*/
/* The 8390 isn't at the base address, so fake the offset
*/
@@
-530,7
+531,7
@@
static int ultramca_close_card(struct net_device *dev)
static int ultramca_remove(struct device *gen_dev)
{
struct mca_device *mca_dev = to_mca_device(gen_dev);
static int ultramca_remove(struct device *gen_dev)
{
struct mca_device *mca_dev = to_mca_device(gen_dev);
- struct net_device *dev =
(struct net_device *)gen_dev->driver_data
;
+ struct net_device *dev =
dev_get_drvdata(gen_dev)
;
if (dev) {
/* NB: ultra_close_card() does free_irq */
if (dev) {
/* NB: ultra_close_card() does free_irq */