diff options
| author | David S. Miller <davem@davemloft.net> | 2009-12-30 16:51:29 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-30 16:51:29 -0500 |
| commit | 3a999e6eb5d277cd6a321dcda3fc43c3d9e4e4b8 (patch) | |
| tree | b0ad8d03710ee556e97515ba1c949233859391ce /net/mac80211/mesh.c | |
| parent | 6cd9b49d7328c4656bfc17fcb47fb814955d40d2 (diff) | |
| parent | 891dc5e73783eeabd2a704a9425e2a199b39c9f9 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-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 e0bd85e3d4b6..61080c5fad50 100644 --- a/net/mac80211/mesh.c +++ b/net/mac80211/mesh.c | |||
| @@ -645,7 +645,7 @@ static void ieee80211_mesh_work(struct work_struct *work) | |||
| 645 | struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh; | 645 | struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh; |
| 646 | struct sk_buff *skb; | 646 | struct sk_buff *skb; |
| 647 | 647 | ||
| 648 | if (!netif_running(sdata->dev)) | 648 | if (!ieee80211_sdata_running(sdata)) |
| 649 | return; | 649 | return; |
| 650 | 650 | ||
| 651 | if (local->scanning) | 651 | if (local->scanning) |