git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
[sfrench/cifs-2.6.git]
/
drivers
/
net
/
wireless
/
airo.c
diff --git
a/drivers/net/wireless/airo.c
b/drivers/net/wireless/airo.c
index b97367d507174778fe24bfc44397167295e73517..d0c97c2200267bc52a0910a54b173fa1c574b494 100644
(file)
--- a/
drivers/net/wireless/airo.c
+++ b/
drivers/net/wireless/airo.c
@@
-2676,7
+2676,7
@@
static void wifi_setup(struct net_device *dev)
dev->addr_len = ETH_ALEN;
dev->tx_queue_len = 100;
dev->addr_len = ETH_ALEN;
dev->tx_queue_len = 100;
-
memset(dev->broadcast,0xFF, ETH_ALEN
);
+
eth_broadcast_addr(dev->broadcast
);
dev->flags = IFF_BROADCAST|IFF_MULTICAST;
}
dev->flags = IFF_BROADCAST|IFF_MULTICAST;
}
@@
-3273,7
+3273,7
@@
static void airo_handle_link(struct airo_info *ai)
}
/* Send event to user space */
}
/* Send event to user space */
-
memset(wrqu.ap_addr.sa_data, '\0', ETH_ALEN
);
+
eth_zero_addr(wrqu.ap_addr.sa_data
);
wrqu.ap_addr.sa_family = ARPHRD_ETHER;
wireless_send_event(ai->dev, SIOCGIWAP, &wrqu, NULL);
}
wrqu.ap_addr.sa_family = ARPHRD_ETHER;
wireless_send_event(ai->dev, SIOCGIWAP, &wrqu, NULL);
}