diff options
Diffstat (limited to 'drivers/net/sb1250-mac.c')
| -rw-r--r-- | drivers/net/sb1250-mac.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/sb1250-mac.c b/drivers/net/sb1250-mac.c index 9944e5d662c0..332031747a23 100644 --- a/drivers/net/sb1250-mac.c +++ b/drivers/net/sb1250-mac.c | |||
| @@ -2112,7 +2112,7 @@ static void sbmac_setmulti(struct sbmac_softc *sc) | |||
| 2112 | uint64_t reg; | 2112 | uint64_t reg; |
| 2113 | void __iomem *port; | 2113 | void __iomem *port; |
| 2114 | int idx; | 2114 | int idx; |
| 2115 | struct dev_mc_list *mclist; | 2115 | struct netdev_hw_addr *ha; |
| 2116 | struct net_device *dev = sc->sbm_dev; | 2116 | struct net_device *dev = sc->sbm_dev; |
| 2117 | 2117 | ||
| 2118 | /* | 2118 | /* |
| @@ -2161,10 +2161,10 @@ static void sbmac_setmulti(struct sbmac_softc *sc) | |||
| 2161 | * XXX if the table overflows */ | 2161 | * XXX if the table overflows */ |
| 2162 | 2162 | ||
| 2163 | idx = 1; /* skip station address */ | 2163 | idx = 1; /* skip station address */ |
| 2164 | netdev_for_each_mc_addr(mclist, dev) { | 2164 | netdev_for_each_mc_addr(ha, dev) { |
| 2165 | if (idx == MAC_ADDR_COUNT) | 2165 | if (idx == MAC_ADDR_COUNT) |
| 2166 | break; | 2166 | break; |
| 2167 | reg = sbmac_addr2reg(mclist->dmi_addr); | 2167 | reg = sbmac_addr2reg(ha->addr); |
| 2168 | port = sc->sbm_base + R_MAC_ADDR_BASE+(idx * sizeof(uint64_t)); | 2168 | port = sc->sbm_base + R_MAC_ADDR_BASE+(idx * sizeof(uint64_t)); |
| 2169 | __raw_writeq(reg, port); | 2169 | __raw_writeq(reg, port); |
| 2170 | idx++; | 2170 | idx++; |
| @@ -2664,7 +2664,6 @@ static int sbmac_close(struct net_device *dev) | |||
| 2664 | static int sbmac_poll(struct napi_struct *napi, int budget) | 2664 | static int sbmac_poll(struct napi_struct *napi, int budget) |
| 2665 | { | 2665 | { |
| 2666 | struct sbmac_softc *sc = container_of(napi, struct sbmac_softc, napi); | 2666 | struct sbmac_softc *sc = container_of(napi, struct sbmac_softc, napi); |
| 2667 | struct net_device *dev = sc->sbm_dev; | ||
| 2668 | int work_done; | 2667 | int work_done; |
| 2669 | 2668 | ||
| 2670 | work_done = sbdma_rx_process(sc, &(sc->sbm_rxdma), budget, 1); | 2669 | work_done = sbdma_rx_process(sc, &(sc->sbm_rxdma), budget, 1); |
