diff options
| author | Mike McCormack <mikem@ring3k.org> | 2011-03-09 00:38:23 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-03-09 15:46:25 -0800 |
| commit | 762bf6dedd7159ea0b6c8150e342b6299e6dd39b (patch) | |
| tree | 20da7ab3a00591357263101c8001579602914dbc /drivers/staging/rtl8192e | |
| parent | 6bad88dac0e648c6978a02c6afb0dc2f4fa484bb (diff) | |
| download | kernel_samsung_smdk4412-762bf6dedd7159ea0b6c8150e342b6299e6dd39b.zip kernel_samsung_smdk4412-762bf6dedd7159ea0b6c8150e342b6299e6dd39b.tar.gz kernel_samsung_smdk4412-762bf6dedd7159ea0b6c8150e342b6299e6dd39b.tar.bz2 | |
staging: rtl8192e: Pass priv to rtl819xE_tx_cmd
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.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/staging/rtl8192e/r8192E_core.c b/drivers/staging/rtl8192e/r8192E_core.c index 597c12d..d92a565 100644 --- a/drivers/staging/rtl8192e/r8192E_core.c +++ b/drivers/staging/rtl8192e/r8192E_core.c @@ -103,7 +103,7 @@ static void rtl8192_irq_rx_tasklet(unsigned long arg); static void rtl8192_irq_tx_tasklet(unsigned long arg); static void rtl8192_prepare_beacon(unsigned long arg); static irqreturn_t rtl8192_interrupt(int irq, void *netdev); -static void rtl819xE_tx_cmd(struct net_device *dev, struct sk_buff *skb); +static void rtl819xE_tx_cmd(struct r8192_priv *priv, struct sk_buff *skb); static void rtl8192_update_ratr_table(struct r8192_priv *priv); static void rtl8192_restart(struct work_struct *work); static void watch_dog_timer_callback(unsigned long data); @@ -879,7 +879,7 @@ static int rtl8192_hard_start_xmit(struct sk_buff *skb,struct net_device *dev) memcpy(skb->cb, &dev, sizeof(dev)); if (queue_index == TXCMD_QUEUE) { - rtl819xE_tx_cmd(dev, skb); + rtl819xE_tx_cmd(priv, skb); ret = 0; return ret; } else { @@ -1050,9 +1050,8 @@ static void rtl8192_net_update(struct r8192_priv *priv) } } -static void rtl819xE_tx_cmd(struct net_device *dev, struct sk_buff *skb) +static void rtl819xE_tx_cmd(struct r8192_priv *priv, struct sk_buff *skb) { - struct r8192_priv *priv = ieee80211_priv(dev); struct rtl8192_tx_ring *ring; tx_desc_819x_pci *entry; unsigned int idx; |