diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-12 21:42:17 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-12 21:42:17 -0800 |
| commit | 7cd082f0147c5fc94b455bcc17fe21b22dbac703 (patch) | |
| tree | 642dcf3b36d563aa7bb070a2a9355805483e857a | |
| parent | b11d0e48aa41b644143ca526ef8d69212fdc1cdd (diff) | |
| parent | 1cf9e8a7865c0ac216034e519cf6b8505055ea50 (diff) | |
| download | blackbird-op-linux-7cd082f0147c5fc94b455bcc17fe21b22dbac703.tar.gz blackbird-op-linux-7cd082f0147c5fc94b455bcc17fe21b22dbac703.zip | |
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
| -rw-r--r-- | drivers/net/skge.c | 10 | ||||
| -rw-r--r-- | net/ieee80211/Kconfig | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/drivers/net/skge.c b/drivers/net/skge.c index 716467879b9c..8b6e2a11e28d 100644 --- a/drivers/net/skge.c +++ b/drivers/net/skge.c @@ -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)) { - netif_stop_queue(dev); - spin_unlock_irqrestore(&skge->tx_lock, flags); + if (!netif_stopped(dev)) { + netif_stop_queue(dev); - printk(KERN_WARNING PFX "%s: ring full when queue awake!\n", - dev->name); + printk(KERN_WARNING PFX "%s: ring full when queue awake!\n", + dev->name); + } + spin_unlock_irqrestore(&skge->tx_lock, flags); return NETDEV_TX_BUSY; } diff --git a/net/ieee80211/Kconfig b/net/ieee80211/Kconfig index 91b16fbf91f0..d18ccba3ea9e 100644 --- a/net/ieee80211/Kconfig +++ b/net/ieee80211/Kconfig @@ -55,7 +55,7 @@ config IEEE80211_CRYPT_CCMP config IEEE80211_CRYPT_TKIP tristate "IEEE 802.11i TKIP encryption" - depends on IEEE80211 + depends on IEEE80211 && NET_RADIO select CRYPTO select CRYPTO_MICHAEL_MIC ---help--- |
