1 diff -Nur old/vmware-any-any-update117d/vmnet-only/bridge.c new/vmware-any-any-update117d/vmnet-only/bridge.c
2 --- old/vmware-any-any-update117d/vmnet-only/bridge.c 2008-08-30 15:50:06.800648000 +0000
3 +++ new/vmware-any-any-update117d/vmnet-only/bridge.c 2008-08-30 16:10:34.153352750 +0000
5 struct net_device *net) // IN: Network device
7 #ifdef VMW_NETDEV_HAS_NET
8 - if (dev_net(net) != dev_net(bridge->internalDev)) {
9 + if (net->nd_net != bridge->internalDev->nd_net) {
13 diff -Nur old/vmware-any-any-update117d/vmnet-only/vmnetInt.h new/vmware-any-any-update117d/vmnet-only/vmnetInt.h
14 --- old/vmware-any-any-update117d/vmnet-only/vmnetInt.h 2008-08-30 15:50:06.800648000 +0000
15 +++ new/vmware-any-any-update117d/vmnet-only/vmnetInt.h 2008-08-30 15:59:47.768956250 +0000
17 # define dev_lock_list() read_lock(&dev_base_lock)
18 # define dev_unlock_list() read_unlock(&dev_base_lock)
19 # ifdef VMW_NETDEV_HAS_NET
20 -# define DEV_GET(x) __dev_get_by_name(dev_net((x)->internalDev), (x)->name)
21 +# define DEV_GET(x) __dev_get_by_name((x)->internalDev->nd_net, (x)->name)
23 # define DEV_GET(x) __dev_get_by_name((x)->name)
27 #ifdef VMW_NETDEV_HAS_NET
28 extern struct proto vmnet_proto;
29 -# define compat_sk_alloc(_bri, _pri) sk_alloc(dev_net((_bri)->internalDev), \
30 +# define compat_sk_alloc(_bri, _pri) sk_alloc((_bri)->internalDev->nd_net, \
31 PF_NETLINK, _pri, &vmnet_proto)
32 #elif defined(VMW_HAVE_SK_ALLOC_WITH_PROTO)
33 extern struct proto vmnet_proto;