diff --git a/[refs] b/[refs] index 32ae1056a2ec..8bd393cb4e92 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 14eabf70c82cade5dbc71d2e913d533193a91785 +refs/heads/master: 9c2f5746b9cd536f0007709196d85a7e7d0070fa diff --git a/trunk/include/linux/netdevice.h b/trunk/include/linux/netdevice.h index d146be40f46c..06ca84d71db4 100644 --- a/trunk/include/linux/netdevice.h +++ b/trunk/include/linux/netdevice.h @@ -756,7 +756,7 @@ static inline void dev_net_set(struct net_device *dev, const struct net *net) { #ifdef CONFIG_NET_NS - dev->nd_dev = net; + dev->nd_net = net; #endif }