diff options
| author | David S. Miller | 2009-12-30 22:51:29 +0100 |
|---|---|---|
| committer | David S. Miller | 2009-12-30 22:51:29 +0100 |
| commit | 3a999e6eb5d277cd6a321dcda3fc43c3d9e4e4b8 (patch) | |
| tree | b0ad8d03710ee556e97515ba1c949233859391ce /net/mac80211/mesh.c | |
| parent | Subject: drivers/net/sh_eth.c: use %pM to shown MAC address (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 (diff) | |
| download | kernel-qcow2-linux-3a999e6eb5d277cd6a321dcda3fc43c3d9e4e4b8.tar.gz kernel-qcow2-linux-3a999e6eb5d277cd6a321dcda3fc43c3d9e4e4b8.tar.xz kernel-qcow2-linux-3a999e6eb5d277cd6a321dcda3fc43c3d9e4e4b8.zip | |
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) struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh; struct sk_buff *skb; - if (!netif_running(sdata->dev)) + if (!ieee80211_sdata_running(sdata)) return; if (local->scanning) |