drivres/net: Change constant name

[deliverable/linux.git] / drivers / net / niu.c

diff --git a/drivers/net/niu.c b/drivers/net/niu.c
index fa61a12c5e1546dc73e1f5394cc18598ef33906a..3ada7ea2abca2cf78e5b0e0f85df70c52b28eba5 100644 (file)
--- a/drivers/net/niu.c
+++ b/drivers/net/niu.c
@@ -4015,7 +4015,7 @@ static void niu_xmac_interrupt(struct niu *np)
                mp->rx_hist_cnt6 += RXMAC_HIST_CNT6_COUNT;
        if (val & XRXMAC_STATUS_RXHIST7_CNT_EXP)
                mp->rx_hist_cnt7 += RXMAC_HIST_CNT7_COUNT;
-       if (val & XRXMAC_STAT_MSK_RXOCTET_CNT_EXP)
+       if (val & XRXMAC_STATUS_RXOCTET_CNT_EXP)
                mp->rx_octets += RXMAC_BT_CNT_COUNT;
        if (val & XRXMAC_STATUS_CVIOLERR_CNT_EXP)
                mp->rx_code_violations += RXMAC_CD_VIO_CNT_COUNT;
@@ -6376,7 +6376,7 @@ static void niu_set_rx_mode(struct net_device *dev)
        if ((dev->flags & IFF_ALLMULTI) || (dev->mc_count > 0))
                np->flags |= NIU_FLAGS_MCAST;
 
-       alt_cnt = dev->uc_count;
+       alt_cnt = dev->uc.count;
        if (alt_cnt > niu_num_alt_addr(np)) {
                alt_cnt = 0;
                np->flags |= NIU_FLAGS_PROMISC;
@@ -6385,7 +6385,7 @@ static void niu_set_rx_mode(struct net_device *dev)
        if (alt_cnt) {
                int index = 0;
 
-               list_for_each_entry(ha, &dev->uc_list, list) {
+               list_for_each_entry(ha, &dev->uc.list, list) {
                        err = niu_set_alt_mac(np, index, ha->addr);
                        if (err)
                                printk(KERN_WARNING PFX "%s: Error %d "