Skip to content

Commit 22bedad

Browse files
Jiri Pirkodavem330
Jiri Pirko
authored and
davem330
committed
net: convert multicast list to list_head
Converts the list and the core manipulating with it to be the same as uc_list. +uses two functions for adding/removing mc address (normal and "global" variant) instead of a function parameter. +removes dev_mcast.c completely. +exposes netdev_hw_addr_list_* macros along with __hw_addr_* functions for manipulation with lists on a sandbox (used in bonding and 80211 drivers) Signed-off-by: Jiri Pirko <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent a748ee2 commit 22bedad

File tree

208 files changed

+1137
-1327
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

208 files changed

+1137
-1327
lines changed

‎drivers/infiniband/hw/nes/nes_nic.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -876,17 +876,16 @@ static void nes_netdev_set_multicast_list(struct net_device *netdev)
876876
if (!mc_all_on) {
877877
char *addrs;
878878
int i;
879-
struct dev_mc_list *mcaddr;
879+
struct netdev_hw_addr *ha;
880880

881881
addrs = kmalloc(ETH_ALEN * mc_count, GFP_ATOMIC);
882882
if (!addrs) {
883883
set_allmulti(nesdev, nic_active_bit);
884884
goto unlock;
885885
}
886886
i = 0;
887-
netdev_for_each_mc_addr(mcaddr, netdev)
888-
memcpy(get_addr(addrs, i++),
889-
mcaddr->dmi_addr, ETH_ALEN);
887+
netdev_for_each_mc_addr(ha, netdev)
888+
memcpy(get_addr(addrs, i++), ha->addr, ETH_ALEN);
890889

891890
perfect_filter_register_address = NES_IDX_PERFECT_FILTER_LOW +
892891
pft_entries_preallocated * 0x8;

‎drivers/infiniband/ulp/ipoib/ipoib_multicast.c

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -783,7 +783,7 @@ void ipoib_mcast_restart_task(struct work_struct *work)
783783
struct ipoib_dev_priv *priv =
784784
container_of(work, struct ipoib_dev_priv, restart_task);
785785
struct net_device *dev = priv->dev;
786-
struct dev_mc_list *mclist;
786+
struct netdev_hw_addr *ha;
787787
struct ipoib_mcast *mcast, *tmcast;
788788
LIST_HEAD(remove_list);
789789
unsigned long flags;
@@ -808,14 +808,13 @@ void ipoib_mcast_restart_task(struct work_struct *work)
808808
clear_bit(IPOIB_MCAST_FLAG_FOUND, &mcast->flags);
809809

810810
/* Mark all of the entries that are found or don't exist */
811-
netdev_for_each_mc_addr(mclist, dev) {
811+
netdev_for_each_mc_addr(ha, dev) {
812812
union ib_gid mgid;
813813

814-
if (!ipoib_mcast_addr_is_valid(mclist->dmi_addr,
815-
dev->broadcast))
814+
if (!ipoib_mcast_addr_is_valid(ha->addr, dev->broadcast))
816815
continue;
817816

818-
memcpy(mgid.raw, mclist->dmi_addr + 4, sizeof mgid);
817+
memcpy(mgid.raw, ha->addr + 4, sizeof mgid);
819818

820819
mcast = __ipoib_mcast_find(dev, &mgid);
821820
if (!mcast || test_bit(IPOIB_MCAST_FLAG_SENDONLY, &mcast->flags)) {

‎drivers/media/dvb/dvb-core/dvb_net.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1109,14 +1109,14 @@ static int dvb_net_feed_stop(struct net_device *dev)
11091109
}
11101110

11111111

1112-
static int dvb_set_mc_filter (struct net_device *dev, struct dev_mc_list *mc)
1112+
static int dvb_set_mc_filter(struct net_device *dev, unsigned char *addr)
11131113
{
11141114
struct dvb_net_priv *priv = netdev_priv(dev);
11151115

11161116
if (priv->multi_num == DVB_NET_MULTICAST_MAX)
11171117
return -ENOMEM;
11181118

1119-
memcpy(priv->multi_macs[priv->multi_num], mc->dmi_addr, 6);
1119+
memcpy(priv->multi_macs[priv->multi_num], addr, ETH_ALEN);
11201120

11211121
priv->multi_num++;
11221122
return 0;
@@ -1140,16 +1140,16 @@ static void wq_set_multicast_list (struct work_struct *work)
11401140
dprintk("%s: allmulti mode\n", dev->name);
11411141
priv->rx_mode = RX_MODE_ALL_MULTI;
11421142
} else if (!netdev_mc_empty(dev)) {
1143-
struct dev_mc_list *mc;
1143+
struct netdev_hw_addr *ha;
11441144

11451145
dprintk("%s: set_mc_list, %d entries\n",
11461146
dev->name, netdev_mc_count(dev));
11471147

11481148
priv->rx_mode = RX_MODE_MULTI;
11491149
priv->multi_num = 0;
11501150

1151-
netdev_for_each_mc_addr(mc, dev)
1152-
dvb_set_mc_filter(dev, mc);
1151+
netdev_for_each_mc_addr(ha, dev)
1152+
dvb_set_mc_filter(dev, ha->addr);
11531153
}
11541154

11551155
netif_addr_unlock_bh(dev);

‎drivers/net/3c505.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1216,7 +1216,7 @@ static int elp_close(struct net_device *dev)
12161216
static void elp_set_mc_list(struct net_device *dev)
12171217
{
12181218
elp_device *adapter = netdev_priv(dev);
1219-
struct dev_mc_list *dmi;
1219+
struct netdev_hw_addr *ha;
12201220
int i;
12211221
unsigned long flags;
12221222

@@ -1231,8 +1231,9 @@ static void elp_set_mc_list(struct net_device *dev)
12311231
adapter->tx_pcb.command = CMD_LOAD_MULTICAST_LIST;
12321232
adapter->tx_pcb.length = 6 * netdev_mc_count(dev);
12331233
i = 0;
1234-
netdev_for_each_mc_addr(dmi, dev)
1235-
memcpy(adapter->tx_pcb.data.multicast[i++], dmi->dmi_addr, 6);
1234+
netdev_for_each_mc_addr(ha, dev)
1235+
memcpy(adapter->tx_pcb.data.multicast[i++],
1236+
ha->addr, 6);
12361237
adapter->got[CMD_LOAD_MULTICAST_LIST] = 0;
12371238
if (!send_pcb(dev, &adapter->tx_pcb))
12381239
pr_err("%s: couldn't send set_multicast command\n", dev->name);

‎drivers/net/3c523.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -625,7 +625,7 @@ static int init586(struct net_device *dev)
625625
volatile struct iasetup_cmd_struct *ias_cmd;
626626
volatile struct tdr_cmd_struct *tdr_cmd;
627627
volatile struct mcsetup_cmd_struct *mc_cmd;
628-
struct dev_mc_list *dmi;
628+
struct netdev_hw_addr *ha;
629629
int num_addrs = netdev_mc_count(dev);
630630

631631
ptr = (void *) ((char *) p->scb + sizeof(struct scb_struct));
@@ -788,8 +788,9 @@ static int init586(struct net_device *dev)
788788
mc_cmd->cmd_link = 0xffff;
789789
mc_cmd->mc_cnt = num_addrs * 6;
790790
i = 0;
791-
netdev_for_each_mc_addr(dmi, dev)
792-
memcpy((char *) mc_cmd->mc_list[i++], dmi->dmi_addr, 6);
791+
netdev_for_each_mc_addr(ha, dev)
792+
memcpy((char *) mc_cmd->mc_list[i++],
793+
ha->addr, 6);
793794
p->scb->cbl_offset = make16(mc_cmd);
794795
p->scb->cmd = CUC_START;
795796
elmc_id_attn586();

‎drivers/net/3c527.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1533,7 +1533,7 @@ static void do_mc32_set_multicast_list(struct net_device *dev, int retry)
15331533
{
15341534
unsigned char block[62];
15351535
unsigned char *bp;
1536-
struct dev_mc_list *dmc;
1536+
struct netdev_hw_addr *ha;
15371537

15381538
if(retry==0)
15391539
lp->mc_list_valid = 0;
@@ -1543,8 +1543,8 @@ static void do_mc32_set_multicast_list(struct net_device *dev, int retry)
15431543
block[0]=netdev_mc_count(dev);
15441544
bp=block+2;
15451545

1546-
netdev_for_each_mc_addr(dmc, dev) {
1547-
memcpy(bp, dmc->dmi_addr, 6);
1546+
netdev_for_each_mc_addr(ha, dev) {
1547+
memcpy(bp, ha->addr, 6);
15481548
bp+=6;
15491549
}
15501550
if(mc32_command_nowait(dev, 2, block,

‎drivers/net/7990.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -595,7 +595,7 @@ static void lance_load_multicast (struct net_device *dev)
595595
struct lance_private *lp = netdev_priv(dev);
596596
volatile struct lance_init_block *ib = lp->init_block;
597597
volatile u16 *mcast_table = (u16 *)&ib->filter;
598-
struct dev_mc_list *dmi;
598+
struct netdev_hw_addr *ha;
599599
char *addrs;
600600
u32 crc;
601601

@@ -610,8 +610,8 @@ static void lance_load_multicast (struct net_device *dev)
610610
ib->filter [1] = 0;
611611

612612
/* Add addresses */
613-
netdev_for_each_mc_addr(dmi, dev) {
614-
addrs = dmi->dmi_addr;
613+
netdev_for_each_mc_addr(ha, dev) {
614+
addrs = ha->addr;
615615

616616
/* multicast address? */
617617
if (!(*addrs & 1))

‎drivers/net/8139cp.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -909,11 +909,11 @@ static void __cp_set_rx_mode (struct net_device *dev)
909909
rx_mode = AcceptBroadcast | AcceptMulticast | AcceptMyPhys;
910910
mc_filter[1] = mc_filter[0] = 0xffffffff;
911911
} else {
912-
struct dev_mc_list *mclist;
912+
struct netdev_hw_addr *ha;
913913
rx_mode = AcceptBroadcast | AcceptMyPhys;
914914
mc_filter[1] = mc_filter[0] = 0;
915-
netdev_for_each_mc_addr(mclist, dev) {
916-
int bit_nr = ether_crc(ETH_ALEN, mclist->dmi_addr) >> 26;
915+
netdev_for_each_mc_addr(ha, dev) {
916+
int bit_nr = ether_crc(ETH_ALEN, ha->addr) >> 26;
917917

918918
mc_filter[bit_nr >> 5] |= 1 << (bit_nr & 31);
919919
rx_mode |= AcceptMulticast;

‎drivers/net/8139too.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2502,11 +2502,11 @@ static void __set_rx_mode (struct net_device *dev)
25022502
rx_mode = AcceptBroadcast | AcceptMulticast | AcceptMyPhys;
25032503
mc_filter[1] = mc_filter[0] = 0xffffffff;
25042504
} else {
2505-
struct dev_mc_list *mclist;
2505+
struct netdev_hw_addr *ha;
25062506
rx_mode = AcceptBroadcast | AcceptMyPhys;
25072507
mc_filter[1] = mc_filter[0] = 0;
2508-
netdev_for_each_mc_addr(mclist, dev) {
2509-
int bit_nr = ether_crc(ETH_ALEN, mclist->dmi_addr) >> 26;
2508+
netdev_for_each_mc_addr(ha, dev) {
2509+
int bit_nr = ether_crc(ETH_ALEN, ha->addr) >> 26;
25102510

25112511
mc_filter[bit_nr >> 5] |= 1 << (bit_nr & 31);
25122512
rx_mode |= AcceptMulticast;

‎drivers/net/82596.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1542,7 +1542,7 @@ static void set_multicast_list(struct net_device *dev)
15421542
}
15431543

15441544
if (!netdev_mc_empty(dev)) {
1545-
struct dev_mc_list *dmi;
1545+
struct netdev_hw_addr *ha;
15461546
unsigned char *cp;
15471547
struct mc_cmd *cmd;
15481548

@@ -1552,10 +1552,10 @@ static void set_multicast_list(struct net_device *dev)
15521552
cmd->cmd.command = CmdMulticastList;
15531553
cmd->mc_cnt = cnt * ETH_ALEN;
15541554
cp = cmd->mc_addrs;
1555-
netdev_for_each_mc_addr(dmi, dev) {
1555+
netdev_for_each_mc_addr(ha, dev) {
15561556
if (!cnt--)
15571557
break;
1558-
memcpy(cp, dmi->dmi_addr, ETH_ALEN);
1558+
memcpy(cp, ha->addr, ETH_ALEN);
15591559
if (i596_debug > 1)
15601560
DEB(DEB_MULTI,printk(KERN_INFO "%s: Adding address %pM\n",
15611561
dev->name, cp));

‎drivers/net/a2065.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -603,7 +603,7 @@ static void lance_load_multicast (struct net_device *dev)
603603
struct lance_private *lp = netdev_priv(dev);
604604
volatile struct lance_init_block *ib = lp->init_block;
605605
volatile u16 *mcast_table = (u16 *)&ib->filter;
606-
struct dev_mc_list *dmi;
606+
struct netdev_hw_addr *ha;
607607
char *addrs;
608608
u32 crc;
609609

@@ -618,8 +618,8 @@ static void lance_load_multicast (struct net_device *dev)
618618
ib->filter [1] = 0;
619619

620620
/* Add addresses */
621-
netdev_for_each_mc_addr(dmi, dev) {
622-
addrs = dmi->dmi_addr;
621+
netdev_for_each_mc_addr(ha, dev) {
622+
addrs = ha->addr;
623623

624624
/* multicast address? */
625625
if (!(*addrs & 1))

‎drivers/net/amd8111e.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1377,7 +1377,7 @@ list to the device.
13771377
*/
13781378
static void amd8111e_set_multicast_list(struct net_device *dev)
13791379
{
1380-
struct dev_mc_list *mc_ptr;
1380+
struct netdev_hw_addr *ha;
13811381
struct amd8111e_priv *lp = netdev_priv(dev);
13821382
u32 mc_filter[2] ;
13831383
int bit_num;
@@ -1408,8 +1408,8 @@ static void amd8111e_set_multicast_list(struct net_device *dev)
14081408
/* load all the multicast addresses in the logic filter */
14091409
lp->options |= OPTION_MULTICAST_ENABLE;
14101410
mc_filter[1] = mc_filter[0] = 0;
1411-
netdev_for_each_mc_addr(mc_ptr, dev) {
1412-
bit_num = (ether_crc_le(ETH_ALEN, mc_ptr->dmi_addr) >> 26) & 0x3f;
1411+
netdev_for_each_mc_addr(ha, dev) {
1412+
bit_num = (ether_crc_le(ETH_ALEN, ha->addr) >> 26) & 0x3f;
14131413
mc_filter[bit_num >> 5] |= 1 << (bit_num & 31);
14141414
}
14151415
amd8111e_writeq(*(u64*)mc_filter,lp->mmio+ LADRF);

‎drivers/net/arm/am79c961a.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -383,12 +383,12 @@ static void am79c961_setmulticastlist (struct net_device *dev)
383383
} else if (dev->flags & IFF_ALLMULTI) {
384384
memset(multi_hash, 0xff, sizeof(multi_hash));
385385
} else {
386-
struct dev_mc_list *dmi;
386+
struct netdev_hw_addr *ha;
387387

388388
memset(multi_hash, 0x00, sizeof(multi_hash));
389389

390-
netdev_for_each_mc_addr(dmi, dev)
391-
am79c961_mc_hash(dmi->dmi_addr, multi_hash);
390+
netdev_for_each_mc_addr(ha, dev)
391+
am79c961_mc_hash(ha->addr, multi_hash);
392392
}
393393

394394
spin_lock_irqsave(&priv->chip_lock, flags);

‎drivers/net/arm/at91_ether.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -556,14 +556,14 @@ static int hash_get_index(__u8 *addr)
556556
*/
557557
static void at91ether_sethashtable(struct net_device *dev)
558558
{
559-
struct dev_mc_list *curr;
559+
struct netdev_hw_addr *ha;
560560
unsigned long mc_filter[2];
561561
unsigned int bitnr;
562562

563563
mc_filter[0] = mc_filter[1] = 0;
564564

565-
netdev_for_each_mc_addr(curr, dev) {
566-
bitnr = hash_get_index(curr->dmi_addr);
565+
netdev_for_each_mc_addr(ha, dev) {
566+
bitnr = hash_get_index(ha->addr);
567567
mc_filter[bitnr >> 5] |= 1 << (bitnr & 31);
568568
}
569569

‎drivers/net/arm/ixp4xx_eth.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -735,7 +735,7 @@ static int eth_xmit(struct sk_buff *skb, struct net_device *dev)
735735
static void eth_set_mcast_list(struct net_device *dev)
736736
{
737737
struct port *port = netdev_priv(dev);
738-
struct dev_mc_list *mclist;
738+
struct netdev_hw_addr *ha;
739739
u8 diffs[ETH_ALEN], *addr;
740740
int i;
741741

@@ -748,11 +748,11 @@ static void eth_set_mcast_list(struct net_device *dev)
748748
memset(diffs, 0, ETH_ALEN);
749749

750750
addr = NULL;
751-
netdev_for_each_mc_addr(mclist, dev) {
751+
netdev_for_each_mc_addr(ha, dev) {
752752
if (!addr)
753-
addr = mclist->dmi_addr; /* first MAC address */
753+
addr = ha->addr; /* first MAC address */
754754
for (i = 0; i < ETH_ALEN; i++)
755-
diffs[i] |= addr[i] ^ mclist->dmi_addr[i];
755+
diffs[i] |= addr[i] ^ ha->addr[i];
756756
}
757757

758758
for (i = 0; i < ETH_ALEN; i++) {

‎drivers/net/arm/ks8695net.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -331,16 +331,16 @@ ks8695_init_partial_multicast(struct ks8695_priv *ksp,
331331
{
332332
u32 low, high;
333333
int i;
334-
struct dev_mc_list *dmi;
334+
struct netdev_hw_addr *ha;
335335

336336
i = 0;
337-
netdev_for_each_mc_addr(dmi, ndev) {
337+
netdev_for_each_mc_addr(ha, ndev) {
338338
/* Ran out of space in chip? */
339339
BUG_ON(i == KS8695_NR_ADDRESSES);
340340

341-
low = (dmi->dmi_addr[2] << 24) | (dmi->dmi_addr[3] << 16) |
342-
(dmi->dmi_addr[4] << 8) | (dmi->dmi_addr[5]);
343-
high = (dmi->dmi_addr[0] << 8) | (dmi->dmi_addr[1]);
341+
low = (ha->addr[2] << 24) | (ha->addr[3] << 16) |
342+
(ha->addr[4] << 8) | (ha->addr[5]);
343+
high = (ha->addr[0] << 8) | (ha->addr[1]);
344344

345345
ks8695_writereg(ksp, KS8695_AAL_(i), low);
346346
ks8695_writereg(ksp, KS8695_AAH_(i), AAH_E | high);

‎drivers/net/at1700.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -848,12 +848,12 @@ set_rx_mode(struct net_device *dev)
848848
memset(mc_filter, 0x00, sizeof(mc_filter));
849849
outb(1, ioaddr + RX_MODE); /* Ignore almost all multicasts. */
850850
} else {
851-
struct dev_mc_list *mclist;
851+
struct netdev_hw_addr *ha;
852852

853853
memset(mc_filter, 0, sizeof(mc_filter));
854-
netdev_for_each_mc_addr(mclist, dev) {
854+
netdev_for_each_mc_addr(ha, dev) {
855855
unsigned int bit =
856-
ether_crc_le(ETH_ALEN, mclist->dmi_addr) >> 26;
856+
ether_crc_le(ETH_ALEN, ha->addr) >> 26;
857857
mc_filter[bit >> 3] |= (1 << bit);
858858
}
859859
outb(0x02, ioaddr + RX_MODE); /* Use normal mode. */

‎drivers/net/atl1c/atl1c_main.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ static void atl1c_set_multi(struct net_device *netdev)
354354
{
355355
struct atl1c_adapter *adapter = netdev_priv(netdev);
356356
struct atl1c_hw *hw = &adapter->hw;
357-
struct dev_mc_list *mc_ptr;
357+
struct netdev_hw_addr *ha;
358358
u32 mac_ctrl_data;
359359
u32 hash_value;
360360

@@ -377,8 +377,8 @@ static void atl1c_set_multi(struct net_device *netdev)
377377
AT_WRITE_REG_ARRAY(hw, REG_RX_HASH_TABLE, 1, 0);
378378

379379
/* comoute mc addresses' hash value ,and put it into hash table */
380-
netdev_for_each_mc_addr(mc_ptr, netdev) {
381-
hash_value = atl1c_hash_mc_addr(hw, mc_ptr->dmi_addr);
380+
netdev_for_each_mc_addr(ha, netdev) {
381+
hash_value = atl1c_hash_mc_addr(hw, ha->addr);
382382
atl1c_hash_set(hw, hash_value);
383383
}
384384
}

‎drivers/net/atl1e/atl1e_main.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ static void atl1e_set_multi(struct net_device *netdev)
284284
{
285285
struct atl1e_adapter *adapter = netdev_priv(netdev);
286286
struct atl1e_hw *hw = &adapter->hw;
287-
struct dev_mc_list *mc_ptr;
287+
struct netdev_hw_addr *ha;
288288
u32 mac_ctrl_data = 0;
289289
u32 hash_value;
290290

@@ -307,8 +307,8 @@ static void atl1e_set_multi(struct net_device *netdev)
307307
AT_WRITE_REG_ARRAY(hw, REG_RX_HASH_TABLE, 1, 0);
308308

309309
/* comoute mc addresses' hash value ,and put it into hash table */
310-
netdev_for_each_mc_addr(mc_ptr, netdev) {
311-
hash_value = atl1e_hash_mc_addr(hw, mc_ptr->dmi_addr);
310+
netdev_for_each_mc_addr(ha, netdev) {
311+
hash_value = atl1e_hash_mc_addr(hw, ha->addr);
312312
atl1e_hash_set(hw, hash_value);
313313
}
314314
}

0 commit comments

Comments
 (0)