Commit 2541fcd9 authored by John Whitmore's avatar John Whitmore Committed by Greg Kroah-Hartman

staging:rtl8192u: typedef struct rx_desc_819x_usb remove typedef

Change structure rx_desc_819x_usb from being typedef to being a simple
structure, without the typedef.

Clears a checkpatch issue, definging new types in the code.
Signed-off-by: default avatarJohn Whitmore <johnfwhitmore@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ec65e266
...@@ -279,7 +279,7 @@ struct rtl8192_rx_info { ...@@ -279,7 +279,7 @@ struct rtl8192_rx_info {
u8 out_pipe; u8 out_pipe;
}; };
typedef struct rx_desc_819x_usb { struct rx_desc_819x_usb {
/* DOWRD 0 */ /* DOWRD 0 */
u16 Length:14; u16 Length:14;
u16 CRC32:1; u16 CRC32:1;
...@@ -292,7 +292,7 @@ typedef struct rx_desc_819x_usb { ...@@ -292,7 +292,7 @@ typedef struct rx_desc_819x_usb {
/* DWORD 1 */ /* DWORD 1 */
u32 Reserved2; u32 Reserved2;
} rx_desc_819x_usb, *prx_desc_819x_usb; };
#ifdef USB_RX_AGGREGATION_SUPPORT #ifdef USB_RX_AGGREGATION_SUPPORT
typedef struct _rx_desc_819x_usb_aggr_subframe { typedef struct _rx_desc_819x_usb_aggr_subframe {
......
...@@ -739,7 +739,7 @@ static void rtl8192_rx_isr(struct urb *urb); ...@@ -739,7 +739,7 @@ static void rtl8192_rx_isr(struct urb *urb);
static u32 get_rxpacket_shiftbytes_819xusb(struct ieee80211_rx_stats *pstats) static u32 get_rxpacket_shiftbytes_819xusb(struct ieee80211_rx_stats *pstats)
{ {
return (sizeof(rx_desc_819x_usb) + pstats->RxDrvInfoSize return (sizeof(struct rx_desc_819x_usb) + pstats->RxDrvInfoSize
+ pstats->RxBufShift); + pstats->RxBufShift);
} }
...@@ -4633,7 +4633,7 @@ static void query_rxdesc_status(struct sk_buff *skb, ...@@ -4633,7 +4633,7 @@ static void query_rxdesc_status(struct sk_buff *skb,
rx_drvinfo_819x_usb *driver_info = NULL; rx_drvinfo_819x_usb *driver_info = NULL;
/* Get Rx Descriptor Information */ /* Get Rx Descriptor Information */
rx_desc_819x_usb *desc = (rx_desc_819x_usb *)skb->data; struct rx_desc_819x_usb *desc = (struct rx_desc_819x_usb *)skb->data;
stats->Length = desc->Length; stats->Length = desc->Length;
stats->RxDrvInfoSize = desc->RxDrvInfoSize; stats->RxDrvInfoSize = desc->RxDrvInfoSize;
...@@ -4659,7 +4659,7 @@ static void query_rxdesc_status(struct sk_buff *skb, ...@@ -4659,7 +4659,7 @@ static void query_rxdesc_status(struct sk_buff *skb,
if (stats->RxDrvInfoSize != 0) { if (stats->RxDrvInfoSize != 0) {
driver_info = (rx_drvinfo_819x_usb *)( driver_info = (rx_drvinfo_819x_usb *)(
skb->data skb->data
+ sizeof(rx_desc_819x_usb) + sizeof(struct rx_desc_819x_usb)
+ stats->RxBufShift + stats->RxBufShift
); );
/* unit: 0.5M */ /* unit: 0.5M */
...@@ -4704,7 +4704,7 @@ static void query_rxdesc_status(struct sk_buff *skb, ...@@ -4704,7 +4704,7 @@ static void query_rxdesc_status(struct sk_buff *skb,
driver_info->FirstAGGR, driver_info->PartAggr); driver_info->FirstAGGR, driver_info->PartAggr);
} }
skb_pull(skb, sizeof(rx_desc_819x_usb)); skb_pull(skb, sizeof(struct rx_desc_819x_usb));
/* Get Total offset of MPDU Frame Body */ /* Get Total offset of MPDU Frame Body */
if ((stats->RxBufShift + stats->RxDrvInfoSize) > 0) { if ((stats->RxBufShift + stats->RxDrvInfoSize) > 0) {
stats->bShift = 1; stats->bShift = 1;
...@@ -4733,7 +4733,7 @@ static void rtl8192_rx_nomal(struct sk_buff *skb) ...@@ -4733,7 +4733,7 @@ static void rtl8192_rx_nomal(struct sk_buff *skb)
bool unicast_packet = false; bool unicast_packet = false;
/* 20 is for ps-poll */ /* 20 is for ps-poll */
if ((skb->len >= (20 + sizeof(rx_desc_819x_usb))) && (skb->len < RX_URB_SIZE)) { if ((skb->len >= (20 + sizeof(struct rx_desc_819x_usb))) && (skb->len < RX_URB_SIZE)) {
/* first packet should not contain Rx aggregation header */ /* first packet should not contain Rx aggregation header */
query_rxdesc_status(skb, &stats, false); query_rxdesc_status(skb, &stats, false);
/* TODO */ /* TODO */
...@@ -4809,7 +4809,7 @@ static void rtl819xusb_process_received_packet( ...@@ -4809,7 +4809,7 @@ static void rtl819xusb_process_received_packet(
static void query_rx_cmdpkt_desc_status(struct sk_buff *skb, static void query_rx_cmdpkt_desc_status(struct sk_buff *skb,
struct ieee80211_rx_stats *stats) struct ieee80211_rx_stats *stats)
{ {
rx_desc_819x_usb *desc = (rx_desc_819x_usb *)skb->data; struct rx_desc_819x_usb *desc = (struct rx_desc_819x_usb *)skb->data;
/* Get Rx Descriptor Information */ /* Get Rx Descriptor Information */
stats->virtual_address = (u8 *)skb->data; stats->virtual_address = (u8 *)skb->data;
...@@ -4835,7 +4835,7 @@ static void rtl8192_rx_cmd(struct sk_buff *skb) ...@@ -4835,7 +4835,7 @@ static void rtl8192_rx_cmd(struct sk_buff *skb)
.freq = IEEE80211_24GHZ_BAND, .freq = IEEE80211_24GHZ_BAND,
}; };
if ((skb->len >= (20 + sizeof(rx_desc_819x_usb))) && (skb->len < RX_URB_SIZE)) { if ((skb->len >= (20 + sizeof(struct rx_desc_819x_usb))) && (skb->len < RX_URB_SIZE)) {
query_rx_cmdpkt_desc_status(skb, &stats); query_rx_cmdpkt_desc_status(skb, &stats);
/* prfd->queue_id = 1; */ /* prfd->queue_id = 1; */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment