diff options
| author | David S. Miller <davem@davemloft.net> | 2008-08-27 07:29:50 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-08-27 07:29:50 -0400 |
| commit | 6c36810a731a422535d838cdb440f332c1d91017 (patch) | |
| tree | ec8c129bbd7b1277cb947621a930ef7dce03d943 /net/mac80211/mesh.c | |
| parent | df69471290cbec7714f6d1fabd14f4e41219cee1 (diff) | |
| parent | 576fdeaef631976c3afcb1d78ef196051282611d (diff) | |
Merge branch 'no-iwlwifi' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/mac80211/mesh.c')
| -rw-r--r-- | net/mac80211/mesh.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c index b5933b271491..35f2f95f2fa7 100644 --- a/net/mac80211/mesh.c +++ b/net/mac80211/mesh.c | |||
| @@ -383,7 +383,7 @@ errcopy: | |||
| 383 | hlist_for_each_safe(p, q, &newtbl->hash_buckets[i]) | 383 | hlist_for_each_safe(p, q, &newtbl->hash_buckets[i]) |
| 384 | tbl->free_node(p, 0); | 384 | tbl->free_node(p, 0); |
| 385 | } | 385 | } |
| 386 | __mesh_table_free(tbl); | 386 | __mesh_table_free(newtbl); |
| 387 | endgrow: | 387 | endgrow: |
| 388 | return NULL; | 388 | return NULL; |
| 389 | } | 389 | } |