diff --git a/[refs] b/[refs] index a322257bd70b..2b4d5346ab47 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bfff6e92a33dce6121a3d83ef3809e9063b2734e +refs/heads/master: e44c39bd8478bf9e41cbc611c74b5879a7b29f58 diff --git a/trunk/include/linux/netdevice.h b/trunk/include/linux/netdevice.h index 6be767c76b37..fea0d9db6846 100644 --- a/trunk/include/linux/netdevice.h +++ b/trunk/include/linux/netdevice.h @@ -906,6 +906,7 @@ static inline void netif_poll_disable(struct net_device *dev) static inline void netif_poll_enable(struct net_device *dev) { + smp_mb__before_clear_bit(); clear_bit(__LINK_STATE_RX_SCHED, &dev->state); }