diff --git a/[refs] b/[refs] index 631a424c7e74..fe463af4819e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1b924032533033a4dae1a239981677bdae21949b +refs/heads/master: 6683ece36e3531fc8c75f69e7165c5f20930be88 diff --git a/trunk/include/linux/netdevice.h b/trunk/include/linux/netdevice.h index 622ba5aa93c4..e535700a3b72 100644 --- a/trunk/include/linux/netdevice.h +++ b/trunk/include/linux/netdevice.h @@ -268,6 +268,12 @@ struct netdev_hw_addr_list { #define netdev_for_each_uc_addr(ha, dev) \ list_for_each_entry(ha, &dev->uc.list, list) +#define netdev_mc_count(dev) ((dev)->mc_count) +#define netdev_mc_empty(dev) (netdev_mc_count(dev) == 0) + +#define netdev_for_each_mc_addr(mclist, dev) \ + for (mclist = dev->mc_list; mclist; mclist = mclist->next) + struct hh_cache { struct hh_cache *hh_next; /* Next entry */ atomic_t hh_refcnt; /* number of users */