diff --git a/[refs] b/[refs] index e9238a534341..62e62cf02ba0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cb61cb9b8b5ef6c2697d84e5015e314626eb2fba +refs/heads/master: 9d45abe1c2949183e5d9cb25721bf1c42c7b5e3b diff --git a/trunk/include/linux/netdevice.h b/trunk/include/linux/netdevice.h index f27fd2009334..06d8ea5992df 100644 --- a/trunk/include/linux/netdevice.h +++ b/trunk/include/linux/netdevice.h @@ -595,8 +595,8 @@ struct net_device int uc_promisc; struct dev_addr_list *mc_list; /* Multicast mac addresses */ int mc_count; /* Number of installed mcasts */ - int promiscuity; - int allmulti; + unsigned int promiscuity; + unsigned int allmulti; /* Protocol specific pointers */