diff --git a/[refs] b/[refs] index 27045c7c213a..9fc38b117d19 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ad8bb78083ff58f5dff3ef8cf8ac3e0336f8ae36 +refs/heads/master: 246f19d194ec99ee8992106e129a133142dc6a10 diff --git a/trunk/include/net/if_inet6.h b/trunk/include/net/if_inet6.h index 66c43e29ea0a..b2cfc4927257 100644 --- a/trunk/include/net/if_inet6.h +++ b/trunk/include/net/if_inet6.h @@ -112,13 +112,13 @@ struct ifmcaddr6 struct ip6_sf_list *mca_sources; struct ip6_sf_list *mca_tomb; unsigned int mca_sfmode; + unsigned char mca_crcount; unsigned long mca_sfcount[2]; struct timer_list mca_timer; unsigned mca_flags; int mca_users; atomic_t mca_refcnt; spinlock_t mca_lock; - unsigned char mca_crcount; unsigned long mca_cstamp; unsigned long mca_tstamp; };