2 files changed, 7 insertions, 5 deletions

diff --git a/drivers/net/skge.c b/drivers/net/skge.c
index 716467879b..8b6e2a11e2 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 91b16fbf91..d18ccba3ea 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---