tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

p54: minor fixes

This patch contains only contains a one-liner fixes and enhancements

Signed-off-by: Christian Lamparter <chunkeey@web.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

authored by

Christian Lamparter and committed by
John W. Linville ffed7858 d131bb59

+8 -4
+7 -3
drivers/net/wireless/p54/p54common.c
··· 530 530 rx_status.noise = priv->noise; 531 531 /* XX correct? */ 532 532 rx_status.qual = (100 * hdr->rssi) / 127; 533 + if (hdr->rate & 0x10) 534 + rx_status.flag |= RX_FLAG_SHORTPRE; 533 535 rx_status.rate_idx = (dev->conf.channel->band == IEEE80211_BAND_2GHZ ? 534 536 hdr->rate : (hdr->rate - 4)) & 0xf; 535 537 rx_status.freq = freq; ··· 578 576 unsigned long flags; 579 577 u32 freed = 0, last_addr = priv->rx_start; 580 578 581 - if (!skb || !dev) 579 + if (unlikely(!skb || !dev || !skb_queue_len(&priv->tx_queue))) 582 580 return; 583 581 584 582 spin_lock_irqsave(&priv->tx_queue.lock, flags); ··· 1201 1199 txhdr->key_type = 0; 1202 1200 txhdr->key_len = 0; 1203 1201 txhdr->hw_queue = queue; 1204 - txhdr->backlog = 32; 1202 + if (current_queue) 1203 + txhdr->backlog = current_queue->len; 1204 + else 1205 + txhdr->backlog = 0; 1205 1206 memset(txhdr->durations, 0, sizeof(txhdr->durations)); 1206 1207 txhdr->tx_antenna = (info->antenna_sel_tx == 0) ? 1207 1208 2 : info->antenna_sel_tx - 1; ··· 1553 1548 while ((skb = skb_dequeue(&priv->tx_queue))) 1554 1549 kfree_skb(skb); 1555 1550 1556 - kfree(priv->cached_beacon); 1557 1551 priv->cached_beacon = NULL; 1558 1552 priv->stop(dev); 1559 1553 priv->tsf_high32 = priv->tsf_low32 = 0;
+1 -1
drivers/net/wireless/p54/p54common.h
··· 259 259 P54_DECRYPT_NOCKIPMIC, 260 260 P54_DECRYPT_FAIL_WEP, 261 261 P54_DECRYPT_FAIL_TKIP, 262 - P54_DECRYPT_FAIL_MICAHEL, 262 + P54_DECRYPT_FAIL_MICHAEL, 263 263 P54_DECRYPT_FAIL_CKIPKP, 264 264 P54_DECRYPT_FAIL_CKIPMIC, 265 265 P54_DECRYPT_FAIL_AESCCMP