]> git.ipfire.org Git - thirdparty/open-vm-tools.git/commitdiff
Changes in shared code that don't affect open-vm-tools functionality.
authorVMware, Inc <>
Tue, 24 Aug 2010 18:19:52 +0000 (11:19 -0700)
committerMarcelo Vanzin <mvanzin@vmware.com>
Tue, 24 Aug 2010 18:19:52 +0000 (11:19 -0700)
Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>
open-vm-tools/modules/linux/shared/compat_netdevice.h

index f77f3cb4d7aaf181a6296d46ee4cccf6f973ce30..d29fcbdefcdcf4b657106fe7c4a3de0e6aaa2d9e 100644 (file)
@@ -299,13 +299,13 @@ static inline int compat_unregister_netdevice_notifier(struct notifier_block *nb
 
 #else
 
+#   define compat_napi_complete(dev, napi) netif_rx_complete(dev)
 #   define compat_napi_schedule(dev, napi) netif_rx_schedule(dev)
 #   define compat_napi_enable(dev, napi)   netif_poll_enable(dev)
 #   define compat_napi_disable(dev, napi)  netif_poll_disable(dev)
 
 /* RedHat ported GRO to 2.6.18 bringing new napi_struct with it */
 #   if defined NETIF_F_GRO
-#      define compat_napi_complete(dev, napi) napi_complete(napi)
 #      define compat_netif_napi_add(netdev, napi, pollcb, quota) \
       do {                        \
          (netdev)->poll = (pollcb);    \
@@ -314,7 +314,6 @@ static inline int compat_unregister_netdevice_notifier(struct notifier_block *nb
       } while (0)
 
 #   else
-#      define compat_napi_complete(dev, napi) netif_rx_complete(dev)
        struct napi_struct {
           int dummy;
        };