diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-20 22:53:36 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-20 22:53:36 +0100 |
| commit | c2f3252b8531c56990ea50e040cbcdf11a233436 (patch) | |
| tree | 7df89d9fca6134705fbf0d4a7298911450f0e9b0 | |
| parent | sungem: missing net_device_ops (diff) | |
| parent | nl80211: Check that function pointer != NULL before using it (diff) | |
| download | linux-c2f3252b8531c56990ea50e040cbcdf11a233436.tar.xz linux-c2f3252b8531c56990ea50e040cbcdf11a233436.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
| -rw-r--r-- | net/wireless/nl80211.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 1e728fff474e..31b807af3235 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -1908,6 +1908,11 @@ static int nl80211_get_mesh_params(struct sk_buff *skb, if (err) return err; + if (!drv->ops->get_mesh_params) { + err = -EOPNOTSUPP; + goto out; + } + /* Get the mesh params */ rtnl_lock(); err = drv->ops->get_mesh_params(&drv->wiphy, dev, &cur_params); @@ -2017,6 +2022,11 @@ static int nl80211_set_mesh_params(struct sk_buff *skb, struct genl_info *info) if (err) return err; + if (!drv->ops->set_mesh_params) { + err = -EOPNOTSUPP; + goto out; + } + /* This makes sure that there aren't more than 32 mesh config * parameters (otherwise our bitfield scheme would not work.) */ BUILD_BUG_ON(NL80211_MESHCONF_ATTR_MAX > 32); @@ -2061,6 +2071,7 @@ static int nl80211_set_mesh_params(struct sk_buff *skb, struct genl_info *info) err = drv->ops->set_mesh_params(&drv->wiphy, dev, &cfg, mask); rtnl_unlock(); + out: /* cleanup */ cfg80211_put_dev(drv); dev_put(dev); |