more net driver fixes

PATCH New Jeff Garzik 1 participant 1 message Dec 13, 2005

Subsystems (2)

Networking Network drivers

lore

Share & tools

lore

Jeff Garzik

author

2005-12-13 05:33 UTC #0 lore raw

PATCH 1/1 more net driver fixes

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

to receive the following updates:

 drivers/net/skge.c    |   10 ++++++----
 net/ieee80211/Kconfig |    2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

Olaf Hering:
ieee80211_crypt_tkip depends on NET_RADIO

Stephen Hemminger:
skge: get rid of warning on race

drivers/net/skge.c +6 -4

index 7164678..8b6e2a1 100644
@@ -2280,11 +2280,13 @@ static int skge_xmit_frame(struct sk_buf
  	}
 
 	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;
 	}

net/ieee80211/Kconfig +1 -1

index 91b16fb..d18ccba 100644
@@ -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---