aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/rtl8192e
diff options
context:
space:
mode:
authorMike McCormack <mikem@ring3k.org>2011-03-09 00:40:33 +0900
committerGreg Kroah-Hartman <gregkh@suse.de>2011-03-09 15:46:28 -0800
commitc62fdce2f78b7571e83954bb0aaabdd0e6880a82 (patch)
tree0dcde63a33df46144bababea2c4b2eb90e454cba /drivers/staging/rtl8192e
parent679a2494fbe357dc81c97a6097d70e53cd2e5b3f (diff)
downloadkernel_samsung_smdk4412-c62fdce2f78b7571e83954bb0aaabdd0e6880a82.zip
kernel_samsung_smdk4412-c62fdce2f78b7571e83954bb0aaabdd0e6880a82.tar.gz
kernel_samsung_smdk4412-c62fdce2f78b7571e83954bb0aaabdd0e6880a82.tar.bz2
staging: rtl8192e: Pass priv to rtl8192_init
Signed-off-by: Mike McCormack <mikem@ring3k.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rtl8192e')
-rw-r--r--drivers/staging/rtl8192e/r8192E_core.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/staging/rtl8192e/r8192E_core.c b/drivers/staging/rtl8192e/r8192E_core.c
index 9bb5bba..f742eb2 100644
--- a/drivers/staging/rtl8192e/r8192E_core.c
+++ b/drivers/staging/rtl8192e/r8192E_core.c
@@ -2416,9 +2416,10 @@ static short rtl8192_get_channel_map(struct r8192_priv *priv)
return 0;
}
-static short rtl8192_init(struct net_device *dev)
+static short rtl8192_init(struct r8192_priv *priv)
{
- struct r8192_priv *priv = ieee80211_priv(dev);
+ struct net_device *dev = priv->ieee80211->dev;
+
memset(&(priv->stats),0,sizeof(struct Stats));
rtl8192_init_priv_variable(priv);
rtl8192_init_priv_lock(priv);
@@ -4655,7 +4656,7 @@ static int __devinit rtl8192_pci_probe(struct pci_dev *pdev,
}
RT_TRACE(COMP_INIT, "Driver probe completed1\n");
- if(rtl8192_init(dev)!=0){
+ if (rtl8192_init(priv)!=0) {
RT_TRACE(COMP_ERR, "Initialization failed\n");
goto fail;
}