Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[karo-tx-linux.git] / drivers / net / wireless / orinoco / hw.c

diff --git a/drivers/net/wireless/orinoco/hw.c b/drivers/net/wireless/orinoco/hw.c
index 9c86acc42794a63bea16ab10e33a71320d18fca4..6fbd78850123fe100737f5bfec9d69005857d254 100644 (file)
--- a/drivers/net/wireless/orinoco/hw.c
+++ b/drivers/net/wireless/orinoco/hw.c
@@ -1083,14 +1083,14 @@ int __orinoco_hw_set_multicast_list(struct orinoco_private *priv,
         * group address if either we want to multicast, or if we were
         * multicasting and want to stop */
        if (!promisc && (mc_count || priv->mc_count)) {
-               struct dev_mc_list *p;
+               struct netdev_hw_addr *ha;
                struct hermes_multicast mclist;
                int i = 0;
 
-               netdev_for_each_mc_addr(p, dev) {
+               netdev_for_each_mc_addr(ha, dev) {
                        if (i == mc_count)
                                break;
-                       memcpy(mclist.addr[i++], p->dmi_addr, ETH_ALEN);
+                       memcpy(mclist.addr[i++], ha->addr, ETH_ALEN);
                }
 
                err = hw->ops->write_ltv(hw, USER_BAP,