renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-18 18:23:53 +08:00
Code

Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

Browse Source
This commit is contained in:
Linus Torvalds 2005-12-12 21:42:17 -08:00
commit 7cd082f014
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/skge.c
View File

@ -2280,11 +2280,13 @@ static int skge_xmit_frame(struct sk_buff *skb, struct net_device *dev)
} }
if (unlikely(skge->tx_avail < skb_shinfo(skb)->nr_frags +1)) { if (unlikely(skge->tx_avail < skb_shinfo(skb)->nr_frags +1)) {
netif_stop_queue(dev); if (!netif_stopped(dev)) {
spin_unlock_irqrestore(&skge->tx_lock, flags); netif_stop_queue(dev);
printk(KERN_WARNING PFX "%s: ring full when queue awake!\n", printk(KERN_WARNING PFX "%s: ring full when queue awake!\n",
dev->name); dev->name);
}
spin_unlock_irqrestore(&skge->tx_lock, flags);
return NETDEV_TX_BUSY; return NETDEV_TX_BUSY;
} }

2
net/ieee80211/Kconfig
View File

@ -55,7 +55,7 @@ config IEEE80211_CRYPT_CCMP
config IEEE80211_CRYPT_TKIP config IEEE80211_CRYPT_TKIP
tristate "IEEE 802.11i TKIP encryption" tristate "IEEE 802.11i TKIP encryption"
depends on IEEE80211 depends on IEEE80211 && NET_RADIO
select CRYPTO select CRYPTO
select CRYPTO_MICHAEL_MIC select CRYPTO_MICHAEL_MIC
---help--- ---help---