diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2007-12-12 10:31:52 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-12-19 19:43:46 -0500 |
commit | 3333590e94262aebb5d0fb767cc7ed8b2359705c (patch) | |
tree | ddd3da4a857c3eae92d3924e1fe1b2da1ff0af65 /net/mac80211 | |
parent | 2d192d9552881f4cf88e62072047c72ef2b5aa7f (diff) |
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.c | 1 |
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 = { | |||
427 | void ieee80211_if_setup(struct net_device *dev) | 427 | void ieee80211_if_setup(struct net_device *dev) |
428 | { | 428 | { |
429 | ether_setup(dev); | 429 | ether_setup(dev); |
430 | dev->header_ops = &ieee80211_header_ops; | ||
431 | dev->hard_start_xmit = ieee80211_subif_start_xmit; | 430 | dev->hard_start_xmit = ieee80211_subif_start_xmit; |
432 | dev->wireless_handlers = &ieee80211_iw_handler_def; | 431 | dev->wireless_handlers = &ieee80211_iw_handler_def; |
433 | dev->set_multicast_list = ieee80211_set_multicast_list; | 432 | dev->set_multicast_list = ieee80211_set_multicast_list; |