aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/rtl8192e/r819xE_cmdpkt.c
diff options
context:
space:
mode:
authorMike McCormack <mikem@ring3k.org>2011-02-06 22:54:29 +0900
committerGreg Kroah-Hartman <gregkh@suse.de>2011-02-09 11:50:18 -0800
commit4803ef77da6ac74b0288be1fd15bdc7fe240acfa (patch)
treefd2f1a7986a7fd59853c79bed4273aa91c5ad9e2 /drivers/staging/rtl8192e/r819xE_cmdpkt.c
parentaebbafddf78e148378eee71f9063f510e9a1cf05 (diff)
downloadkernel_samsung_smdk4412-4803ef77da6ac74b0288be1fd15bdc7fe240acfa.zip
kernel_samsung_smdk4412-4803ef77da6ac74b0288be1fd15bdc7fe240acfa.tar.gz
kernel_samsung_smdk4412-4803ef77da6ac74b0288be1fd15bdc7fe240acfa.tar.bz2
staging: rtl8192e: Remove RTL8192P and RTL8192U ifdefs
Signed-off-by: Mike McCormack <mikem@ring3k.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rtl8192e/r819xE_cmdpkt.c')
-rw-r--r--drivers/staging/rtl8192e/r819xE_cmdpkt.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/drivers/staging/rtl8192e/r819xE_cmdpkt.c b/drivers/staging/rtl8192e/r819xE_cmdpkt.c
index 11ad7cf..ef6f2de 100644
--- a/drivers/staging/rtl8192e/r819xE_cmdpkt.c
+++ b/drivers/staging/rtl8192e/r819xE_cmdpkt.c
@@ -40,9 +40,6 @@ RT_STATUS cmpk_message_handle_tx(
{
RT_STATUS rt_status = RT_STATUS_SUCCESS;
-#ifdef RTL8192U
- return rt_status;
-#else
struct r8192_priv *priv = ieee80211_priv(dev);
u16 frag_threshold;
u16 frag_length = 0, frag_offset = 0;
@@ -74,11 +71,7 @@ RT_STATUS cmpk_message_handle_tx(
/* Allocate skb buffer to contain firmware info and tx descriptor info
* add 4 to avoid packet appending overflow.
* */
-#ifdef RTL8192U
- skb = dev_alloc_skb(USB_HWDESC_HEADER_LEN + frag_length + 4);
-#else
skb = dev_alloc_skb(frag_length + priv->ieee80211->tx_headroom + 4);
-#endif
if(skb == NULL) {
rt_status = RT_STATUS_FAILURE;
goto Failed;
@@ -91,10 +84,6 @@ RT_STATUS cmpk_message_handle_tx(
tcb_desc->bLastIniPkt = bLastIniPkt;
tcb_desc->pkt_size = frag_length;
-#ifdef RTL8192U
- skb_reserve(skb, USB_HWDESC_HEADER_LEN);
-#endif
-
//seg_ptr = skb_put(skb, frag_length + priv->ieee80211->tx_headroom);
seg_ptr = skb_put(skb, priv->ieee80211->tx_headroom);
@@ -126,9 +115,6 @@ RT_STATUS cmpk_message_handle_tx(
Failed:
//spin_unlock_irqrestore(&priv->tx_lock,flags);
return rt_status;
-
-
-#endif
}
static void