evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

Browse source
This commit is contained in:
David S. Miller 2009-03-20 14:53:36 -07:00
commit c2f3252b85
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
net/wireless/nl80211.c
View file

@ -1908,6 +1908,11 @@ static int nl80211_get_mesh_params(struct sk_buff *skb,
if (err) if (err)
return err; return err;
if (!drv->ops->get_mesh_params) {
err = -EOPNOTSUPP;
goto out;
}
/* Get the mesh params */ /* Get the mesh params */
rtnl_lock(); rtnl_lock();
err = drv->ops->get_mesh_params(&drv->wiphy, dev, &cur_params); 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) if (err)
return 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 /* This makes sure that there aren't more than 32 mesh config
* parameters (otherwise our bitfield scheme would not work.) */ * parameters (otherwise our bitfield scheme would not work.) */
BUILD_BUG_ON(NL80211_MESHCONF_ATTR_MAX > 32); 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); err = drv->ops->set_mesh_params(&drv->wiphy, dev, &cfg, mask);
rtnl_unlock(); rtnl_unlock();
out:
/* cleanup */ /* cleanup */
cfg80211_put_dev(drv); cfg80211_put_dev(drv);
dev_put(dev); dev_put(dev);