aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-05-19 00:08:20 -0400
committerDavid S. Miller <davem@davemloft.net>2009-05-19 00:08:20 -0400
commitbb803cfbecb03a0cf8dc7e1864f18dda6631af00 (patch)
tree6c0989693bea6f50cfa5c6bb14f52ec19668def3 /net/mac80211
parent3878fb6fdbceecca20b15748f807340854220f06 (diff)
parent511e11e396dc596825ce04d53d7f6d579404bc01 (diff)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/scsi/fcoe/fcoe.c
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/rc80211_minstrel.c2
-rw-r--r--net/mac80211/rc80211_pid_algo.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/rc80211_minstrel.c b/net/mac80211/rc80211_minstrel.c
index efaf38349731..0a11515341ba 100644
--- a/net/mac80211/rc80211_minstrel.c
+++ b/net/mac80211/rc80211_minstrel.c
@@ -479,7 +479,7 @@ minstrel_alloc_sta(void *priv, struct ieee80211_sta *sta, gfp_t gfp)
479 479
480 for (i = 0; i < IEEE80211_NUM_BANDS; i++) { 480 for (i = 0; i < IEEE80211_NUM_BANDS; i++) {
481 sband = hw->wiphy->bands[i]; 481 sband = hw->wiphy->bands[i];
482 if (sband->n_bitrates > max_rates) 482 if (sband && sband->n_bitrates > max_rates)
483 max_rates = sband->n_bitrates; 483 max_rates = sband->n_bitrates;
484 } 484 }
485 485
diff --git a/net/mac80211/rc80211_pid_algo.c b/net/mac80211/rc80211_pid_algo.c
index 6704fb55c6b2..a0bef767ceb5 100644
--- a/net/mac80211/rc80211_pid_algo.c
+++ b/net/mac80211/rc80211_pid_algo.c
@@ -380,7 +380,7 @@ static void *rate_control_pid_alloc(struct ieee80211_hw *hw,
380 380
381 for (i = 0; i < IEEE80211_NUM_BANDS; i++) { 381 for (i = 0; i < IEEE80211_NUM_BANDS; i++) {
382 sband = hw->wiphy->bands[i]; 382 sband = hw->wiphy->bands[i];
383 if (sband->n_bitrates > max_rates) 383 if (sband && sband->n_bitrates > max_rates)
384 max_rates = sband->n_bitrates; 384 max_rates = sband->n_bitrates;
385 } 385 }
386 386