Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-18 09:02:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

staging: rtl8192u: remove define always set USE_ONE_PIPE

Browse Source 
Also remove the code previously under #ifndef USE_ONE_PIPE.

Signed-off-by: Antoine Schweitzer-Chaput <antoine@schweitzer-chaput.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Antoine Schweitzer-Chaput 2014-06-24 20:41:39 +02:00 committed by Greg Kroah-Hartman
parent e2709273e6
commit 24de874861
2 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/staging/rtl8192u/Makefile
View File

@ -8,7 +8,6 @@ ccflags-y += -DJACKSON_NEW_8187 -DJACKSON_NEW_RX
ccflags-y += -DTHOMAS_BEACON -DTHOMAS_TASKLET -DTHOMAS_SKB -DTHOMAS_TURBO ccflags-y += -DTHOMAS_BEACON -DTHOMAS_TASKLET -DTHOMAS_SKB -DTHOMAS_TURBO
#ccflags-y += -DUSB_TX_DRIVER_AGGREGATION_ENABLE #ccflags-y += -DUSB_TX_DRIVER_AGGREGATION_ENABLE
#ccflags-y += -DUSB_RX_AGGREGATION_SUPPORT #ccflags-y += -DUSB_RX_AGGREGATION_SUPPORT
ccflags-y += -DUSE_ONE_PIPE
ccflags-y += -Idrivers/staging/rtl8192u/ieee80211 ccflags-y += -Idrivers/staging/rtl8192u/ieee80211
r8192u_usb-y := r8192U_core.o r8180_93cx6.o r8192U_wx.o \ r8192u_usb-y := r8192U_core.o r8180_93cx6.o r8192U_wx.o \

19
drivers/staging/rtl8192u/r8192U_core.c
View File

@ -1543,15 +1543,6 @@ u16 N_DBPSOfRate(u16 DataRate)
return N_DBPS; return N_DBPS;
} }
unsigned int txqueue2outpipe(struct r8192_priv *priv, unsigned int tx_queue)
{
if (tx_queue >= 9) {
RT_TRACE(COMP_ERR, "%s():Unknown queue ID!!!\n", __func__);
return 0x04;
}
return priv->txqueue_to_outpipemap[tx_queue];
}
short rtl819xU_tx_cmd(struct net_device *dev, struct sk_buff *skb) short rtl819xU_tx_cmd(struct net_device *dev, struct sk_buff *skb)
{ {
struct r8192_priv *priv = ieee80211_priv(dev); struct r8192_priv *priv = ieee80211_priv(dev);
@ -1581,12 +1572,7 @@ short rtl819xU_tx_cmd(struct net_device *dev, struct sk_buff *skb)
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
// Fill up USB_OUT_CONTEXT. // Fill up USB_OUT_CONTEXT.
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
// Get index to out pipe from specified QueueID.
#ifndef USE_ONE_PIPE
idx_pipe = txqueue2outpipe(priv, queue_index);
#else
idx_pipe = 0x04; idx_pipe = 0x04;
#endif
usb_fill_bulk_urb(tx_urb, priv->udev, usb_sndbulkpipe(priv->udev, idx_pipe), usb_fill_bulk_urb(tx_urb, priv->udev, usb_sndbulkpipe(priv->udev, idx_pipe),
skb->data, skb->len, rtl8192_tx_isr, skb); skb->data, skb->len, rtl8192_tx_isr, skb);
@ -1915,12 +1901,7 @@ short rtl8192_tx(struct net_device *dev, struct sk_buff *skb)
//DWORD 2 //DWORD 2
tx_desc->TxBufferSize = (u32)(skb->len - USB_HWDESC_HEADER_LEN); tx_desc->TxBufferSize = (u32)(skb->len - USB_HWDESC_HEADER_LEN);
} }
/* Get index to out pipe from specified QueueID */
#ifndef USE_ONE_PIPE
idx_pipe = txqueue2outpipe(priv, tcb_desc->queue_index);
#else
idx_pipe = 0x5; idx_pipe = 0x5;
#endif
/* To submit bulk urb */ /* To submit bulk urb */
usb_fill_bulk_urb(tx_urb, udev, usb_fill_bulk_urb(tx_urb, udev,