summaryrefslogtreecommitdiffstats
path: root/net/mac80211
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2007-12-12 16:31:52 +0100
committerDavid S. Miller <davem@sunset.davemloft.net>2007-12-19 16:43:46 -0800
commit3333590e94262aebb5d0fb767cc7ed8b2359705c (patch)
treeddd3da4a857c3eae92d3924e1fe1b2da1ff0af65 /net/mac80211
parent2d192d9552881f4cf88e62072047c72ef2b5aa7f (diff)
downloadblackbird-op-linux-3333590e94262aebb5d0fb767cc7ed8b2359705c.tar.gz
blackbird-op-linux-3333590e94262aebb5d0fb767cc7ed8b2359705c.zip
mac80211: fix header ops
When using recvfrom() on a SOCK_DGRAM packet socket, I noticed that the MAC address passed back for wireless frames was always completely wrong. The reason for this is that the header parse function assigned to our virtual interfaces is a function parsing an 802.11 rather than 802.3 header. This patch fixes it by keeping the default ethernet header operations assigned. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/ieee80211.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/mac80211/ieee80211.c b/net/mac80211/ieee80211.c
index 505af1f067ab..6378850d8580 100644
--- a/net/mac80211/ieee80211.c
+++ b/net/mac80211/ieee80211.c
@@ -427,7 +427,6 @@ static const struct header_ops ieee80211_header_ops = {
void ieee80211_if_setup(struct net_device *dev)
{
ether_setup(dev);
- dev->header_ops = &ieee80211_header_ops;
dev->hard_start_xmit = ieee80211_subif_start_xmit;
dev->wireless_handlers = &ieee80211_iw_handler_def;
dev->set_multicast_list = ieee80211_set_multicast_list;
OpenPOWER on IntegriCloud