diff --git a/[refs] b/[refs] index 84fdf8d40608..ac438d1d4a96 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8e4795605d1e1b39113818ad7c147b8a867a1f6a +refs/heads/master: 18e225f257663c59ff9d4482f07ffd06361fc2ec diff --git a/trunk/include/linux/netdevice.h b/trunk/include/linux/netdevice.h index a343a21ba8b9..d1a21b576a40 100644 --- a/trunk/include/linux/netdevice.h +++ b/trunk/include/linux/netdevice.h @@ -260,7 +260,7 @@ struct netdev_hw_addr_list { #define netdev_mc_count(dev) netdev_hw_addr_list_count(&(dev)->mc) #define netdev_mc_empty(dev) netdev_hw_addr_list_empty(&(dev)->mc) -#define netdev_for_each_mc_addr(mclist, dev) \ +#define netdev_for_each_mc_addr(ha, dev) \ netdev_hw_addr_list_for_each(ha, &(dev)->mc) struct hh_cache {