app-emulation/vmware-modules/files/1.0.0.20-vmnet-2.6.26.patch

   1 --- ./vmnet-only/bridge.c       2008-05-16 07:59:28.000000000 +0200
   2 +++ ./vmnet-only/bridge.c       2008-08-07 22:12:50.000000000 +0200
   3 @@ -275,8 +275,12 @@
   4                          struct net_device *net)  // IN: Network device
   5  {
   6  #ifdef VMW_NETDEV_HAS_NET
   7 +# if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26)
   8     if (net->nd_net != bridge->internalDev->nd_net) {
   9 -      return 0;
  10 +# else
  11 +   if (dev_net(net) != dev_net(bridge->internalDev)) {
  12 +# endif
  13 +     return 0;
  14     }
  15  #endif
  16     return strcmp(net->name, bridge->name) == 0;
  17 --- ./vmnet-only/procfs.c       2008-05-16 07:59:28.000000000 +0200
  18 +++ ./vmnet-only/procfs.c       2008-08-07 22:15:58.000000000 +0200
  19 @@ -63,7 +63,11 @@
  20  {
  21     int retval;
  22
  23 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26)
  24     retval = VNetProc_MakeEntry(&proc_root, "vmnet", S_IFDIR, &base);
  25 +#else
  26 +   retval = VNetProc_MakeEntry(NULL, "vmnet", S_IFDIR, &base);
  27 +#endif
  28     if (retval) {
  29        return retval;
  30     }
  31 @@ -95,7 +99,11 @@
  32  void
  33  VNetProc_Cleanup(void)
  34  {
  35 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26)
  36     VNetProc_RemoveEntry(base, &proc_root);
  37 +#else
  38 +   VNetProc_RemoveEntry(base, NULL);
  39 +#endif
  40     base = NULL;
  41  }
  42
  43 --- ./vmnet-only/vmnetInt.h     2008-05-16 07:59:28.000000000 +0200
  44 +++ ./vmnet-only/vmnetInt.h     2008-08-07 22:20:13.000000000 +0200
  45 @@ -63,7 +63,11 @@
  46  #   define dev_lock_list()    read_lock(&dev_base_lock)
  47  #   define dev_unlock_list()  read_unlock(&dev_base_lock)
  48  #   ifdef VMW_NETDEV_HAS_NET
  49 +#     if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26)
  50  #      define DEV_GET(x)      __dev_get_by_name((x)->internalDev->nd_net, (x)->name)
  51 +#     else
  52 +#      define DEV_GET(x)      __dev_get_by_name(dev_net((x)->internalDev), (x)->name)
  53 +#     endif
  54  #   else
  55  #      define DEV_GET(x)      __dev_get_by_name((x)->name)
  56  #   endif
  57 @@ -89,8 +93,13 @@
  58
  59  #ifdef VMW_NETDEV_HAS_NET
  60  extern struct proto vmnet_proto;
  61 +# if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26)
  62  #   define compat_sk_alloc(_bri, _pri) sk_alloc((_bri)->internalDev->nd_net, \
  63                                                  PF_NETLINK, _pri, &vmnet_proto)
  64 +# else
  65 +#  define compat_sk_alloc(_bri, _pri) sk_alloc(dev_net((_bri)->internalDev), \
  66 +                                                 PF_NETLINK, _pri, &vmnet_proto)
  67 +# endif
  68  #elif defined(VMW_HAVE_SK_ALLOC_WITH_PROTO)
  69  extern struct proto vmnet_proto;
  70  #   define compat_sk_alloc(_bri, _pri) sk_alloc(PF_NETLINK, _pri, &vmnet_proto, 1)