summaryrefslogtreecommitdiffstats
path: root/net/wireless
diff options
context:
space:
mode:
authorBill Jordan <bjordan@ig88.(none)>2010-10-01 13:54:28 -0400
committerJohn W. Linville <linville@tuxdriver.com>2010-10-05 13:35:24 -0400
commite8347ebad2f1b15bddb6ed3ed5f767531eb52dc3 (patch)
tree02fa4846517ea56b06c0c6ad40d5870ca321153a /net/wireless
parente51f3eff9a7e17ddd749799d4291f7e33e9883b9 (diff)
downloadop-kernel-dev-e8347ebad2f1b15bddb6ed3ed5f767531eb52dc3.zip
op-kernel-dev-e8347ebad2f1b15bddb6ed3ed5f767531eb52dc3.tar.gz
cfg80211: patches to allow setting the WDS peer
Added a nl interface to set the peer bssid of a WDS interface. Signed-off-by: Bill Jordan <bjordan@rajant.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/wireless')
-rw-r--r--net/wireless/nl80211.c54
1 files changed, 54 insertions, 0 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 21061cc..fd92b6b 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -603,6 +603,7 @@ static int nl80211_send_wiphy(struct sk_buff *msg, u32 pid, u32 seq, int flags,
NLA_PUT_U32(msg, i, NL80211_CMD_SET_WIPHY_NETNS);
}
CMD(set_channel, SET_CHANNEL);
+ CMD(set_wds_peer, SET_WDS_PEER);
#undef CMD
@@ -833,6 +834,53 @@ static int nl80211_set_channel(struct sk_buff *skb, struct genl_info *info)
return result;
}
+static int nl80211_set_wds_peer(struct sk_buff *skb, struct genl_info *info)
+{
+ struct cfg80211_registered_device *rdev;
+ struct wireless_dev *wdev;
+ struct net_device *dev;
+ u8 *bssid;
+ int err;
+
+ if (!info->attrs[NL80211_ATTR_MAC])
+ return -EINVAL;
+
+ rtnl_lock();
+
+ err = get_rdev_dev_by_info_ifindex(info, &rdev, &dev);
+ if (err)
+ goto unlock_rtnl;
+
+ wdev = dev->ieee80211_ptr;
+
+ if (netif_running(dev)) {
+ err = -EBUSY;
+ goto out;
+ }
+
+ if (!rdev->ops->set_wds_peer) {
+ err = -EOPNOTSUPP;
+ goto out;
+ }
+
+ if (wdev->iftype != NL80211_IFTYPE_WDS) {
+ err = -EOPNOTSUPP;
+ goto out;
+ }
+
+ bssid = nla_data(info->attrs[NL80211_ATTR_MAC]);
+ err = rdev->ops->set_wds_peer(wdev->wiphy, dev, bssid);
+
+out:
+ cfg80211_unlock_rdev(rdev);
+ dev_put(dev);
+unlock_rtnl:
+ rtnl_unlock();
+
+ return err;
+}
+
+
static int nl80211_set_wiphy(struct sk_buff *skb, struct genl_info *info)
{
struct cfg80211_registered_device *rdev;
@@ -5473,6 +5521,12 @@ static struct genl_ops nl80211_ops[] = {
.policy = nl80211_policy,
.flags = GENL_ADMIN_PERM,
},
+ {
+ .cmd = NL80211_CMD_SET_WDS_PEER,
+ .doit = nl80211_set_wds_peer,
+ .policy = nl80211_policy,
+ .flags = GENL_ADMIN_PERM,
+ },
};
static struct genl_multicast_group nl80211_mlme_mcgrp = {
OpenPOWER on IntegriCloud