提交 44b23b48 编写于 作者: J Joe Perches 提交者: John W. Linville

ath9k: hif_usb: Reduce indent 1 column

Invert test and return early.
Move variable declarations to local scope.
Don't initialize variables to 0 unnecessarily.
Signed-off-by: NJoe Perches <joe@perches.com>
Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>
上级 eb272441
...@@ -363,9 +363,9 @@ static void ath9k_hif_usb_rx_stream(struct hif_device_usb *hif_dev, ...@@ -363,9 +363,9 @@ static void ath9k_hif_usb_rx_stream(struct hif_device_usb *hif_dev,
struct sk_buff *skb) struct sk_buff *skb)
{ {
struct sk_buff *nskb, *skb_pool[MAX_PKT_NUM_IN_TRANSFER]; struct sk_buff *nskb, *skb_pool[MAX_PKT_NUM_IN_TRANSFER];
int index = 0, i = 0, chk_idx, len = skb->len; int index = 0, i = 0, len = skb->len;
int rx_remain_len = 0, rx_pkt_len = 0; int rx_remain_len, rx_pkt_len;
u16 pkt_len, pkt_tag, pool_index = 0; u16 pool_index = 0;
u8 *ptr; u8 *ptr;
spin_lock(&hif_dev->rx_lock); spin_lock(&hif_dev->rx_lock);
...@@ -399,64 +399,64 @@ static void ath9k_hif_usb_rx_stream(struct hif_device_usb *hif_dev, ...@@ -399,64 +399,64 @@ static void ath9k_hif_usb_rx_stream(struct hif_device_usb *hif_dev,
spin_unlock(&hif_dev->rx_lock); spin_unlock(&hif_dev->rx_lock);
while (index < len) { while (index < len) {
u16 pkt_len;
u16 pkt_tag;
u16 pad_len;
int chk_idx;
ptr = (u8 *) skb->data; ptr = (u8 *) skb->data;
pkt_len = ptr[index] + (ptr[index+1] << 8); pkt_len = ptr[index] + (ptr[index+1] << 8);
pkt_tag = ptr[index+2] + (ptr[index+3] << 8); pkt_tag = ptr[index+2] + (ptr[index+3] << 8);
if (pkt_tag == ATH_USB_RX_STREAM_MODE_TAG) { if (pkt_tag != ATH_USB_RX_STREAM_MODE_TAG) {
u16 pad_len; RX_STAT_INC(skb_dropped);
return;
pad_len = 4 - (pkt_len & 0x3); }
if (pad_len == 4)
pad_len = 0; pad_len = 4 - (pkt_len & 0x3);
if (pad_len == 4)
chk_idx = index; pad_len = 0;
index = index + 4 + pkt_len + pad_len;
chk_idx = index;
if (index > MAX_RX_BUF_SIZE) { index = index + 4 + pkt_len + pad_len;
spin_lock(&hif_dev->rx_lock);
hif_dev->rx_remain_len = index - MAX_RX_BUF_SIZE; if (index > MAX_RX_BUF_SIZE) {
hif_dev->rx_transfer_len = spin_lock(&hif_dev->rx_lock);
MAX_RX_BUF_SIZE - chk_idx - 4; hif_dev->rx_remain_len = index - MAX_RX_BUF_SIZE;
hif_dev->rx_pad_len = pad_len; hif_dev->rx_transfer_len =
MAX_RX_BUF_SIZE - chk_idx - 4;
nskb = __dev_alloc_skb(pkt_len + 32, hif_dev->rx_pad_len = pad_len;
GFP_ATOMIC);
if (!nskb) { nskb = __dev_alloc_skb(pkt_len + 32, GFP_ATOMIC);
dev_err(&hif_dev->udev->dev, if (!nskb) {
"ath9k_htc: RX memory allocation" dev_err(&hif_dev->udev->dev,
" error\n"); "ath9k_htc: RX memory allocation error\n");
spin_unlock(&hif_dev->rx_lock);
goto err;
}
skb_reserve(nskb, 32);
RX_STAT_INC(skb_allocated);
memcpy(nskb->data, &(skb->data[chk_idx+4]),
hif_dev->rx_transfer_len);
/* Record the buffer pointer */
hif_dev->remain_skb = nskb;
spin_unlock(&hif_dev->rx_lock); spin_unlock(&hif_dev->rx_lock);
} else { goto err;
nskb = __dev_alloc_skb(pkt_len + 32, GFP_ATOMIC);
if (!nskb) {
dev_err(&hif_dev->udev->dev,
"ath9k_htc: RX memory allocation"
" error\n");
goto err;
}
skb_reserve(nskb, 32);
RX_STAT_INC(skb_allocated);
memcpy(nskb->data, &(skb->data[chk_idx+4]), pkt_len);
skb_put(nskb, pkt_len);
skb_pool[pool_index++] = nskb;
} }
skb_reserve(nskb, 32);
RX_STAT_INC(skb_allocated);
memcpy(nskb->data, &(skb->data[chk_idx+4]),
hif_dev->rx_transfer_len);
/* Record the buffer pointer */
hif_dev->remain_skb = nskb;
spin_unlock(&hif_dev->rx_lock);
} else { } else {
RX_STAT_INC(skb_dropped); nskb = __dev_alloc_skb(pkt_len + 32, GFP_ATOMIC);
return; if (!nskb) {
dev_err(&hif_dev->udev->dev,
"ath9k_htc: RX memory allocation error\n");
goto err;
}
skb_reserve(nskb, 32);
RX_STAT_INC(skb_allocated);
memcpy(nskb->data, &(skb->data[chk_idx+4]), pkt_len);
skb_put(nskb, pkt_len);
skb_pool[pool_index++] = nskb;
} }
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册