Re: [PATCH] staging: remove all code dependent onLINUX_VERSION_CODE

[Charles Clément]

Hello Jiri,

On Tue, May 25, 2010 at 02:16:50PM +0200, Jiri Kosina wrote:
> On Tue, 25 May 2010, Andreas Schwab wrote:

> diff --git a/drivers/staging/cxt1e1/pmcc4.h b/drivers/staging/cxt1e1/pmcc4.h
> index 26c1f0e..e288a0a 100644
> --- a/drivers/staging/cxt1e1/pmcc4.h
> +++ b/drivers/staging/cxt1e1/pmcc4.h
> @@ -117,12 +117,6 @@ extern      "C"
>  
>  #include "pmcc4_private.h"
>  
> -#if !(LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
> -char       *get_hdlc_name (hdlc_device *);
> -
> -#endif
> -
> -

Shouldn't that declaration be kept?


> diff --git a/drivers/staging/rtl8192e/ieee80211/ieee80211_crypt_tkip.c b/drivers/staging/rtl8192e/ieee80211/ieee80211_crypt_tkip.c
> index 65f4889..14ca610 100644
> --- a/drivers/staging/rtl8192e/ieee80211/ieee80211_crypt_tkip.c
> +++ b/drivers/staging/rtl8192e/ieee80211/ieee80211_crypt_tkip.c

> @@ -886,32 +711,18 @@ static int ieee80211_tkip_set_key(void *key, int len, u8 *seq, void *priv)
>  {
>  	struct ieee80211_tkip_data *tkey = priv;
>  	int keyidx;
> -#if((LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21)) && (!OPENSUSE_SLED))
> -	struct crypto_tfm *tfm = tkey->tx_tfm_michael;
> -	struct crypto_tfm *tfm2 = tkey->tx_tfm_arc4;
> -	struct crypto_tfm *tfm3 = tkey->rx_tfm_michael;
> -	struct crypto_tfm *tfm4 = tkey->rx_tfm_arc4;
> -#else
>  	struct crypto_hash *tfm = tkey->tx_tfm_michael;
>  	struct crypto_blkcipher *tfm2 = tkey->tx_tfm_arc4;
>  	struct crypto_hash *tfm3 = tkey->rx_tfm_michael;
>  	struct crypto_blkcipher *tfm4 = tkey->rx_tfm_arc4;
> -#endif
>  
>  	keyidx = tkey->key_idx;
>  	memset(tkey, 0, sizeof(*tkey));
>  	tkey->key_idx = keyidx;
> -#if((LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21)) && (!OPENSUSE_SLED))
>  	tkey->tx_tfm_michael = tfm;
>  	tkey->tx_tfm_arc4 = tfm2;
>  	tkey->rx_tfm_michael = tfm3;
>  	tkey->rx_tfm_arc4 = tfm4;
> -#else
> -	tkey->tx_tfm_michael = tfm;
> -	tkey->tx_tfm_arc4 = tfm2;
> -	tkey->rx_tfm_michael = tfm3;
> -	tkey->rx_tfm_arc4 = tfm4;
> -#endif

In this block, it is not the same branch that are kept, don't you want
to keep the same ones?

-- 
Charles Clément

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/