From 08748cef424a2f92bf727dc1e0a504e633ca1204 Mon Sep 17 00:00:00 2001 From: Tim Gardner Date: Mon, 27 Oct 2008 12:42:01 -0600 Subject: [PATCH] Added backported diffs for pcmcia_parse_tuple() in libertas Signed-off-by: Tim Gardner Signed-off-by: Luis R. Rodriguez --- compat/compat.diff | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/compat/compat.diff b/compat/compat.diff index d86acc4821c7..454a91a97b35 100644 --- a/compat/compat.diff +++ b/compat/compat.diff @@ -172,3 +172,19 @@ index 3cfc303..33c76b0 100644 if (res != 0) goto err_kfree_ssb; +diff --git a/drivers/net/wireless/libertas/if_cs.c b/drivers/net/wireless/libertas/if_cs.c +index 842a08d..079c1fd 100644 +--- a/drivers/net/wireless/libertas/if_cs.c ++++ b/drivers/net/wireless/libertas/if_cs.c +@@ -791,7 +791,11 @@ static int if_cs_probe(struct pcmcia_device *p_dev) + tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY; + if ((ret = pcmcia_get_first_tuple(p_dev, &tuple)) != 0 || + (ret = pcmcia_get_tuple_data(p_dev, &tuple)) != 0 || ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28)) ++ (ret = pcmcia_parse_tuple(NULL,&tuple, &parse)) != 0) ++#else + (ret = pcmcia_parse_tuple(&tuple, &parse)) != 0) ++#endif + { + lbs_pr_err("error in pcmcia_get_first_tuple etc\n"); + goto out1; -- 2.30.2