diff --git a/[refs] b/[refs] index cbccb1cf8ed5..5a971265e46c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 773d202194be84cc17d35f62516eac6d8db833e6 +refs/heads/master: 57a9f236ebe76be6fe1c85b5f7b3cea842e44177 diff --git a/trunk/drivers/net/r8169.c b/trunk/drivers/net/r8169.c index 7aa9cf4e9e98..982a9010c7a9 100644 --- a/trunk/drivers/net/r8169.c +++ b/trunk/drivers/net/r8169.c @@ -2953,10 +2953,11 @@ static void rtl_set_rx_mode(struct net_device *dev) mc_filter[1] = 0xffffffff; } - RTL_W32(RxConfig, tmp); RTL_W32(MAR0 + 0, mc_filter[0]); RTL_W32(MAR0 + 4, mc_filter[1]); + RTL_W32(RxConfig, tmp); + spin_unlock_irqrestore(&tp->lock, flags); }