lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging: rtl8192e: Pass priv to rtl819xE_tx_cmd

Browse Source 
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Mike McCormack
2011-03-09 00:38:23 +09:00
committed by Greg Kroah-Hartman
parent 6bad88dac0
commit 762bf6dedd
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/staging/rtl8192e/r8192E_core.c
View File

@@ -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_irq_tx_tasklet(unsigned long arg);
static void rtl8192_prepare_beacon(unsigned long arg); static void rtl8192_prepare_beacon(unsigned long arg);
static irqreturn_t rtl8192_interrupt(int irq, void *netdev); 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_update_ratr_table(struct r8192_priv *priv);
static void rtl8192_restart(struct work_struct *work); static void rtl8192_restart(struct work_struct *work);
static void watch_dog_timer_callback(unsigned long data); 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)); memcpy(skb->cb, &dev, sizeof(dev));
if (queue_index == TXCMD_QUEUE) { if (queue_index == TXCMD_QUEUE) {
rtl819xE_tx_cmd(dev, skb); rtl819xE_tx_cmd(priv, skb);
ret = 0; ret = 0;
return ret; return ret;
} else { } 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; struct rtl8192_tx_ring *ring;
tx_desc_819x_pci *entry; tx_desc_819x_pci *entry;
unsigned int idx; unsigned int idx;