Skip to contentSkip to conversation

pull request: wireless-2.6 2009-12-11

PATCH John W. Linville 2 participants 2 messages Dec 11, 2009

Subsystems (6)
lore
Share & tools
lore
#0 lore raw

Dave,

Here is another little batch of fixes intended for 2.6.33. Most of them are tiny. The rtl8187 led patch is self-contained and squashes a warning during suspend. The regulatory rules update only applies to the people _not_ using CRDA, which should be fairly rare nowadays. But still, anyone using that configuration should be working with current and safe rules.

Please let me know if there are problems!

Thanks,

John

---

Individual patches are available here:

http://www.kernel.org/pub/linux/kernel/people/linville/wireless-2.6/

---

The following changes since commit 43de004b6c197b0ea408bdebf4f14afdead74b63:
Anton Vorontsov (1):
gianfar: Fix build with CONFIG_NET_POLL_CONTROLLER=y

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git master

Herton Ronaldo Krzesinski (1):
rtl8187: add radio led and fix warnings on suspend

Javier Cardona (2):
mac80211: Fixed bug in mesh portal paths
mac80211: Revert 'Use correct sign for mesh active path refresh'

John W. Linville (2):
wireless: correctly report signal value for IEEE80211_HW_SIGNAL_UNSPEC
wireless: update old static regulatory domain rules

Julia Lawall (1):
net/mac80211: Correct size given to memset

Larry Finger (1):
b43: Remove reset after fatal DMA error

Luis R. Rodriguez (1):
ath5k: enable EEPROM checksum check

Vivek Natarajan (1):
cfg80211: Clear encryption privacy when key off is done.

 drivers/net/wireless/ath/ath5k/eeprom.c     |    3 +-
 drivers/net/wireless/b43/main.c             |    5 ++-
 drivers/net/wireless/rtl818x/rtl8187.h      |    1 +
 drivers/net/wireless/rtl818x/rtl8187_leds.c |   68 +++++++++++++++++--------
 drivers/net/wireless/rtl818x/rtl8187_leds.h |    2 +
 net/mac80211/cfg.c                          |    3 +-
 net/mac80211/mesh.c                         |    2 +-
 net/mac80211/mesh.h                         |    5 +-
 net/mac80211/mesh_hwmp.c                    |    2 +-
 net/mac80211/rx.c                           |    1 -
 net/wireless/reg.c                          |   75 +++++++++------------------
 net/wireless/wext-compat.c                  |    1 +
 12 files changed, 88 insertions(+), 80 deletions(-)
drivers/net/wireless/ath/ath5k/eeprom.c +1 -2
index 644962a..7918852 100644
@@ -97,6 +97,7 @@ ath5k_eeprom_init_header(struct ath5k_hw *ah)
 	struct ath5k_eeprom_info *ee = &ah->ah_capabilities.cap_eeprom;
 	int ret;
 	u16 val;
+	u32 cksum, offset;
 
 	/*
 	 * Read values from EEPROM and store them in the capability structure
@@ -111,7 +112,6 @@ ath5k_eeprom_init_header(struct ath5k_hw *ah)
 	if (ah->ah_ee_version < AR5K_EEPROM_VERSION_3_0)
 		return 0;
 
-#ifdef notyet
 	/*
 	 * Validate the checksum of the EEPROM date. There are some
 	 * devices with invalid EEPROMs.
@@ -124,7 +124,6 @@ ath5k_eeprom_init_header(struct ath5k_hw *ah)
 		ATH5K_ERR(ah->ah_sc, "Invalid EEPROM checksum 0x%04x\n", cksum);
 		return -EIO;
 	}
-#endif
 
 	AR5K_EEPROM_READ_HDR(AR5K_EEPROM_ANT_GAIN(ah->ah_ee_version),
 	    ee_ant_gain);
drivers/net/wireless/b43/main.c +4 -1
index 077480c..19b4eae 100644
@@ -1784,7 +1784,10 @@ static void b43_do_interrupt_thread(struct b43_wldev *dev)
 			       dma_reason[0], dma_reason[1],
 			       dma_reason[2], dma_reason[3],
 			       dma_reason[4], dma_reason[5]);
-			b43_controller_restart(dev, "DMA error");
+			b43err(dev->wl, "This device does not support DMA "
+			       "on your system. Please use PIO instead.\n");
+			b43err(dev->wl, "CONFIG_B43_FORCE_PIO must be set in "
+			       "your kernel configuration.\n");
 			return;
 		}
 		if (merged_dma_reason & B43_DMAIRQ_NONFATALMASK) {
drivers/net/wireless/rtl818x/rtl8187.h +1 -0
index b1a24de..6af0f3f 100644
@@ -108,6 +108,7 @@ struct rtl8187_priv {
 	struct delayed_work work;
 	struct ieee80211_hw *dev;
 #ifdef CONFIG_RTL8187_LEDS
+	struct rtl8187_led led_radio;
 	struct rtl8187_led led_tx;
 	struct rtl8187_led led_rx;
 	struct delayed_work led_on;
drivers/net/wireless/rtl818x/rtl8187_leds.c +47 -21

112 lines not on this page · raw message

drivers/net/wireless/rtl818x/rtl8187_leds.h +2 -0
index a033202..efe8041 100644
@@ -47,6 +47,8 @@ struct rtl8187_led {
 	u8 ledpin;
 	/* The unique name string for this LED device. */
 	char name[RTL8187_LED_MAX_NAME_LEN + 1];
+	/* If the LED is radio or tx/rx */
+	bool is_radio;
 };
 
 void rtl8187_leds_init(struct ieee80211_hw *dev, u16 code);
net/mac80211/cfg.c +2 -1
index 93ee1fd..6dc3579 100644
@@ -354,7 +354,8 @@ static void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo)
 	sinfo->rx_packets = sta->rx_packets;
 	sinfo->tx_packets = sta->tx_packets;
 
-	if (sta->local->hw.flags & IEEE80211_HW_SIGNAL_DBM) {
+	if ((sta->local->hw.flags & IEEE80211_HW_SIGNAL_DBM) ||
+	    (sta->local->hw.flags & IEEE80211_HW_SIGNAL_UNSPEC)) {
 		sinfo->filled |= STATION_INFO_SIGNAL;
 		sinfo->signal = (s8)sta->last_signal;
 	}
net/mac80211/mesh.c +1 -1
index c0fe464..6a43314 100644
@@ -427,7 +427,7 @@ int ieee80211_new_mesh_header(struct ieee80211s_hdr *meshhdr,
 		char *addr5, char *addr6)
 {
 	int aelen = 0;
-	memset(meshhdr, 0, sizeof(meshhdr));
+	memset(meshhdr, 0, sizeof(*meshhdr));
 	meshhdr->ttl = sdata->u.mesh.mshcfg.dot11MeshTTL;
 	put_unaligned(cpu_to_le32(sdata->u.mesh.mesh_seqnum), &meshhdr->seqnum);
 	sdata->u.mesh.mesh_seqnum++;
net/mac80211/mesh.h +3 -2
index 31e1025..85562c5 100644
@@ -188,8 +188,9 @@ struct mesh_rmc {
  */
 #define MESH_PREQ_MIN_INT	10
 #define MESH_DIAM_TRAVERSAL_TIME 50
-/* Paths will be refreshed if they are closer than PATH_REFRESH_TIME to their
- * expiration
+/* A path will be refreshed if it is used PATH_REFRESH_TIME milliseconds before
+ * timing out.  This way it will remain ACTIVE and no data frames will be
+ * unnecesarily held in the pending queue.
  */
 #define MESH_PATH_REFRESH_TIME			1000
 #define MESH_MIN_DISCOVERY_TIMEOUT (2 * MESH_DIAM_TRAVERSAL_TIME)
net/mac80211/mesh_hwmp.c +1 -1
index 833b2f3..d28acb6 100644
@@ -937,7 +937,7 @@ int mesh_nexthop_lookup(struct sk_buff *skb,
 
 	if (mpath->flags & MESH_PATH_ACTIVE) {
 		if (time_after(jiffies,
-			       mpath->exp_time +
+			       mpath->exp_time -
 			       msecs_to_jiffies(sdata->u.mesh.mshcfg.path_refresh_time)) &&
 		    !memcmp(sdata->dev->dev_addr, hdr->addr4, ETH_ALEN) &&
 		    !(mpath->flags & MESH_PATH_RESOLVING) &&
net/mac80211/rx.c +0 -1
index f237df4..9f2807a 100644
@@ -1712,7 +1712,6 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx)
 			mpp_path_add(proxied_addr, mpp_addr, sdata);
 		} else {
 			spin_lock_bh(&mppath->state_lock);
-			mppath->exp_time = jiffies;
 			if (compare_ether_addr(mppath->mpp, mpp_addr) != 0)
 				memcpy(mppath->mpp, mpp_addr, ETH_ALEN);
 			spin_unlock_bh(&mppath->state_lock);
net/wireless/reg.c +25 -50

102 lines not on this page · raw message

net/wireless/wext-compat.c +1 -0
index 584eb48..54face3 100644
@@ -479,6 +479,7 @@ static int __cfg80211_set_encryption(struct cfg80211_registered_device *rdev,
 			}
 			err = rdev->ops->del_key(&rdev->wiphy, dev, idx, addr);
 		}
+		wdev->wext.connect.privacy = false;
 		/*
 		 * Applications using wireless extensions expect to be
 		 * able to delete keys that don't exist, so allow that.
Signature · 2 lines
John W. Linville		Someday the world will need a hero, and you
[email protected]			might be all we have.  Be ready.
maintainer
#1 lore raw

From: "John W. Linville" <[email protected]>
Date: Fri, 11 Dec 2009 14:37:57 -0500

Quoted 10 lines

Dave,

Here is another little batch of fixes intended for 2.6.33. Most of them are tiny. The rtl8187 led patch is self-contained and squashes a warning during suspend. The regulatory rules update only applies to the people _not_ using CRDA, which should be fairly rare nowadays. But still, anyone using that configuration should be working with current and safe rules.

Please let me know if there are problems!

Pulled, thanks a lot John.