From: Jiri Benc <jbenc@suse.cz>
To: "John W. Linville" <linville@tuxdriver.com>
Cc: linux-wireless@vger.kernel.org
Subject: [PATCH 2/19] mac80211: remove useless callbacks from wmaster
Date: Fri, 23 Mar 2007 21:44:44 +0100 (CET) [thread overview]
Message-ID: <20070323204444.499A54849D@silver.suse.cz> (raw)
In-Reply-To: <20070323214400.642621638.midnight@suse.cz>
Wireless handlers (and other callbacks) on master interface only confuse
users. Let's get rid of them.
Signed-off-by: Jiri Benc <jbenc@suse.cz>
---
net/mac80211/ieee80211.c | 3 ---
net/mac80211/ieee80211_i.h | 1 -
net/mac80211/ieee80211_ioctl.c | 22 ----------------------
3 files changed, 0 insertions(+), 26 deletions(-)
9e00ff1fabe362774319e9d24fe866a0140b0f34
diff --git a/net/mac80211/ieee80211.c b/net/mac80211/ieee80211.c
index 3d4fabe..e7576c5 100644
--- a/net/mac80211/ieee80211.c
+++ b/net/mac80211/ieee80211.c
@@ -4597,9 +4597,6 @@ struct ieee80211_hw *ieee80211_alloc_hw(
sta_info_init(local);
mdev->hard_start_xmit = ieee80211_master_start_xmit;
- mdev->wireless_handlers = &ieee80211_iw_master_handler_def;
- mdev->do_ioctl = ieee80211_ioctl;
- mdev->change_mtu = ieee80211_change_mtu;
mdev->tx_timeout = ieee80211_tx_timeout;
mdev->get_stats = ieee80211_get_stats;
mdev->open = ieee80211_master_open;
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 9df8ef0..4398453 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -627,7 +627,6 @@ struct net_device_stats *ieee80211_dev_s
/* ieee80211_ioctl.c */
int ieee80211_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
extern const struct iw_handler_def ieee80211_iw_handler_def;
-extern const struct iw_handler_def ieee80211_iw_master_handler_def;
/* Set hw encryption from ieee80211 */
int ieee80211_set_hw_encryption(struct net_device *dev,
diff --git a/net/mac80211/ieee80211_ioctl.c b/net/mac80211/ieee80211_ioctl.c
index ae224c6..93a204b 100644
--- a/net/mac80211/ieee80211_ioctl.c
+++ b/net/mac80211/ieee80211_ioctl.c
@@ -3280,25 +3280,3 @@ const struct iw_handler_def ieee80211_iw
.private_args = (struct iw_priv_args *) ieee80211_ioctl_priv,
.get_wireless_stats = ieee80211_get_wireless_stats,
};
-
-/* Wireless handlers for master interface */
-
-static const iw_handler ieee80211_master_handler[] =
-{
- [SIOCGIWNAME - SIOCIWFIRST] = (iw_handler) ieee80211_ioctl_giwname,
- [SIOCSIWFREQ - SIOCIWFIRST] = (iw_handler) ieee80211_ioctl_siwfreq,
- [SIOCGIWFREQ - SIOCIWFIRST] = (iw_handler) ieee80211_ioctl_giwfreq,
- [SIOCGIWRANGE - SIOCIWFIRST] = (iw_handler) ieee80211_ioctl_giwrange,
- [SIOCSIWRTS - SIOCIWFIRST] = (iw_handler) ieee80211_ioctl_siwrts,
- [SIOCGIWRTS - SIOCIWFIRST] = (iw_handler) ieee80211_ioctl_giwrts,
- [SIOCSIWFRAG - SIOCIWFIRST] = (iw_handler) ieee80211_ioctl_siwfrag,
- [SIOCGIWFRAG - SIOCIWFIRST] = (iw_handler) ieee80211_ioctl_giwfrag,
- [SIOCSIWRETRY - SIOCIWFIRST] = (iw_handler) ieee80211_ioctl_siwretry,
- [SIOCGIWRETRY - SIOCIWFIRST] = (iw_handler) ieee80211_ioctl_giwretry,
-};
-
-const struct iw_handler_def ieee80211_iw_master_handler_def =
-{
- .num_standard = sizeof(ieee80211_master_handler) / sizeof(iw_handler),
- .standard = ieee80211_master_handler,
-};
--
1.3.0
next prev parent reply other threads:[~2007-03-23 20:43 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-03-23 20:44 [PATCH 0/19] d80211: pull request Jiri Benc
2007-03-23 20:44 ` [PATCH 1/19] mac80211: drop packets from nonexisting interfaces in PS mode Jiri Benc
2007-03-23 20:44 ` Jiri Benc [this message]
2007-03-23 20:44 ` [PATCH 3/19] mac80211: fix rtnl locking in ieee80211_register_hw Jiri Benc
2007-03-23 20:44 ` [PATCH 4/19] mac80211: Remove curr_rates and fix related concurrency issues Jiri Benc
2007-03-23 20:44 ` [PATCH 5/19] mac80211: Remove tx_timeout callback Jiri Benc
2007-03-23 20:44 ` [PATCH 6/19] mac80211: Set carrier status for STA interfaces Jiri Benc
2007-03-23 20:44 ` [PATCH 7/19] mac80211: Stop virtual interfaces during scan Jiri Benc
2007-03-23 20:44 ` [PATCH 8/19] mac80211: Fix pkt_type annotations Jiri Benc
2007-03-23 20:44 ` [PATCH 9/19] mac80211: move PHY things to debugfs Jiri Benc
2007-03-23 20:44 ` [PATCH 10/19] mac80211: move sta dir " Jiri Benc
2007-03-23 20:44 ` [PATCH 11/19] mac80211: move per-netdev and key stuff " Jiri Benc
2007-03-23 20:44 ` [PATCH 12/19] mac80211 debugfs Kconfig Jiri Benc
2007-03-23 20:44 ` [PATCH 13/19] mac80211: fix remaining sparse warnings Jiri Benc
2007-03-23 20:44 ` [PATCH 14/19] mac80211: switch STA interfaces to PS mode during scan Jiri Benc
2007-03-23 20:44 ` [PATCH 15/19] mac80211: fix wrong keyidx will change default key Jiri Benc
2007-03-23 20:44 ` [PATCH 16/19] mac80211: fix passing wrong pointer to ieee80211_dump_frame Jiri Benc
2007-03-23 20:45 ` [PATCH 17/19] mac80211: Properly kill tasklets before shutdown Jiri Benc
2007-03-23 20:45 ` [PATCH 18/19] mac80211: Prevent unregistering of unregistered hw Jiri Benc
2007-03-23 20:45 ` [PATCH 19/19] mac80211: Add software sequence support Jiri Benc
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070323204444.499A54849D@silver.suse.cz \
--to=jbenc@suse.cz \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).