diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2007-07-10 19:32:08 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2007-07-12 16:07:25 -0400 |
| commit | 40f7cac9f8dd662c1dd02334afdceef0be03e34f (patch) | |
| tree | 6c8cedbfa99b67305d1b845d7a140a0a185981a6 /net/mac80211/ieee80211_iface.c | |
| parent | 333af2f0715c8d4d38cb657d8f4fb7c4e3ceba9f (diff) | |
| download | blackbird-op-linux-40f7cac9f8dd662c1dd02334afdceef0be03e34f.tar.gz blackbird-op-linux-40f7cac9f8dd662c1dd02334afdceef0be03e34f.zip | |
[PATCH] mac80211: separate monitor/subif_start_xmit
This patch separates the monitor interface start_xmit from the
subif start xmit (those other devices have 802.3 framing, monitor
interfaces have radiotap framing)
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Jiri Benc <jbenc@suse.cz>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/ieee80211_iface.c')
| -rw-r--r-- | net/mac80211/ieee80211_iface.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/mac80211/ieee80211_iface.c b/net/mac80211/ieee80211_iface.c index cf0f32e8c2a2..8532a5ccdd1e 100644 --- a/net/mac80211/ieee80211_iface.c +++ b/net/mac80211/ieee80211_iface.c @@ -157,6 +157,8 @@ void ieee80211_if_set_type(struct net_device *dev, int type) struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr); int oldtype = sdata->type; + dev->hard_start_xmit = ieee80211_subif_start_xmit; + sdata->type = type; switch (type) { case IEEE80211_IF_TYPE_WDS: @@ -196,6 +198,7 @@ void ieee80211_if_set_type(struct net_device *dev, int type) } case IEEE80211_IF_TYPE_MNTR: dev->type = ARPHRD_IEEE80211_RADIOTAP; + dev->hard_start_xmit = ieee80211_monitor_start_xmit; break; default: printk(KERN_WARNING "%s: %s: Unknown interface type 0x%x", |
