diff --git a/[refs] b/[refs] index 6c04093875bf..0e50327979c8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 772698f6362680b65211f7efc68121f1e4c28aa5 +refs/heads/master: 4a1c537113cdc688aabc3fb9bb6ed18ec821c779 diff --git a/trunk/include/linux/netdevice.h b/trunk/include/linux/netdevice.h index 8f00bdf95ef4..dc3c15b726bc 100644 --- a/trunk/include/linux/netdevice.h +++ b/trunk/include/linux/netdevice.h @@ -41,6 +41,7 @@ #include #include +struct net; struct vlan_group; struct ethtool_ops; struct netpoll_info; @@ -663,6 +664,9 @@ struct net_device void (*poll_controller)(struct net_device *dev); #endif + /* Network namespace this network device is inside */ + struct net *nd_net; + /* bridge stuff */ struct net_bridge_port *br_port; /* macvlan */