ia64/xen-unstable

changeset 6426:fab3e2747dc2

g/c Linux 2.4 netback support.
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>
author cl349@firebug.cl.cam.ac.uk
date Thu Aug 25 14:41:06 2005 +0000 (2005-08-25)
parents 488bdf86c686
children 3428d58a85e1
files linux-2.6-xen-sparse/drivers/xen/netback/netback.c
line diff
     1.1 --- a/linux-2.6-xen-sparse/drivers/xen/netback/netback.c	Thu Aug 25 14:40:15 2005 +0000
     1.2 +++ b/linux-2.6-xen-sparse/drivers/xen/netback/netback.c	Thu Aug 25 14:41:06 2005 +0000
     1.3 @@ -13,10 +13,6 @@
     1.4  #include "common.h"
     1.5  #include <asm-xen/balloon.h>
     1.6  
     1.7 -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
     1.8 -#include <linux/delay.h>
     1.9 -#endif
    1.10 -
    1.11  #if defined(CONFIG_XEN_NETDEV_GRANT_TX) || defined(CONFIG_XEN_NETDEV_GRANT_RX)
    1.12  #include <asm-xen/xen-public/grant_table.h>
    1.13  #include <asm-xen/gnttab.h>
    1.14 @@ -153,11 +149,7 @@ static inline void maybe_schedule_tx_act
    1.15  static inline int is_xen_skb(struct sk_buff *skb)
    1.16  {
    1.17      extern kmem_cache_t *skbuff_cachep;
    1.18 -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
    1.19      kmem_cache_t *cp = (kmem_cache_t *)virt_to_page(skb->head)->lru.next;
    1.20 -#else
    1.21 -    kmem_cache_t *cp = (kmem_cache_t *)virt_to_page(skb->head)->list.next;
    1.22 -#endif
    1.23      return (cp == skbuff_cachep);
    1.24  }
    1.25  
    1.26 @@ -642,11 +634,7 @@ static void net_tx_action(unsigned long 
    1.27                  netif->credit_timeout.expires  = next_credit;
    1.28                  netif->credit_timeout.data     = (unsigned long)netif;
    1.29                  netif->credit_timeout.function = tx_credit_callback;
    1.30 -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
    1.31                  add_timer_on(&netif->credit_timeout, smp_processor_id());
    1.32 -#else
    1.33 -                add_timer(&netif->credit_timeout); 
    1.34 -#endif
    1.35                  break;
    1.36              }
    1.37          }