Skip to content

L
linux-davinci
Commit 7cd082f0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

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

parents b11d0e48 1cf9e8a7
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 5 deletions
drivers/net/skge.c
View file @ 7cd082f0
...@@ -2280,11 +2280,13 @@ static int skge_xmit_frame(struct sk_buff *skb, struct net_device *dev) ...@@ -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;
} }
......
net/ieee80211/Kconfig
View file @ 7cd082f0
...@@ -55,7 +55,7 @@ config IEEE80211_CRYPT_CCMP ...@@ -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---
......
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