[2.6 patch] remove kernel 2.2 code from drivers/net/hamradio/dmascc.c

From: Adrian Bunk (bunk_at_fs.tum.de)
Date: 02/07/04

  • Next message: Matthew Wilcox: "Re: [patch] sym53c8xx_2 uses SYM_MEM_CLUSTER_SHIFT before its #define'd"
    Date:	Sat, 7 Feb 2004 21:45:38 +0100
    To: klaus.kudielka@ieee.org
    
    

    The patch below removes some #ifdef'd kernel 2.2 code from
    drivers/net/hamradio/dmascc.c .

    cu
    Adrian

    --- linux-2.6.2-mm1/drivers/net/hamradio/dmascc.c.old 2004-02-07 21:39:39.000000000 +0100
    +++ linux-2.6.2-mm1/drivers/net/hamradio/dmascc.c 2004-02-07 21:39:58.000000000 +0100
    @@ -48,21 +48,6 @@
     #include "z8530.h"
     
     
    -/* Linux 2.2 and 2.3 compatibility */
    -
    -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,14)
    -#define net_device device
    -#endif
    -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,43)
    -#define netif_start_queue(dev) { dev->tbusy = 0; }
    -#define netif_stop_queue(dev) { dev->tbusy = 1; }
    -#define netif_wake_queue(dev) { dev->tbusy = 0; mark_bh(NET_BH); }
    -#endif
    -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,47)
    -#define netif_running(dev) (dev->flags & IFF_UP)
    -#endif
    -
    -
     /* Number of buffers per channel */
     
     #define NUM_TX_BUF 2 /* NUM_TX_BUF >= 1 (min. 2 recommended) */
    @@ -210,9 +195,6 @@
     };
     
     struct scc_priv {
    -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
    - char name[IFNAMSIZ];
    -#endif
       int type;
       int chip;
       struct net_device *dev;
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/


  • Next message: Matthew Wilcox: "Re: [patch] sym53c8xx_2 uses SYM_MEM_CLUSTER_SHIFT before its #define'd"

    Relevant Pages

    • Re: Granting some root permissions to certain users
      ... We use a kernel patch called trustees to do just what you're talking ... Unfortunately the patch hasn't really been kept up-to-date. ... send the line "unsubscribe linux-kernel" in ...
      (Linux-Kernel)
    • Re: RT-V0.7.47-17 build fails
      ... On Monday 06 June 2005 03:41, Ingo Molnar wrote: ... >> I thought maybe I'd exersize this kernel, but a patch I thought ... send the line "unsubscribe linux-kernel" in ...
      (Linux-Kernel)
    • RE: [PATCH] 2.6 workaround for Athlon/Opteron prefetch errata
      ... to avoid so we can get this in to the 2.6 kernel ASAP. ... I am pretty certain the patch won't impact the ... > might want to kill the condition depending on the stepping, ... send the line "unsubscribe linux-kernel" in ...
      (Linux-Kernel)
    • Re: 2.6.3-rc1-mm1
      ... > This is the first time that anyone told me that it even existed. ... When we're at kernel version 2.6.3! ... without this patch. ... send the line "unsubscribe linux-kernel" in ...
      (Linux-Kernel)
    • Re: Question re the dot releases such as 2.6.12.3
      ... I'll submit a patch to the ... > kernel from the home page. ... Copyright 2005 by Maurice Eugene Heskett, ... send the line "unsubscribe linux-kernel" in ...
      (Linux-Kernel)