diff --git a/[refs] b/[refs]
index ff63eed0bec5..52cc86648434 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2d192d9552881f4cf88e62072047c72ef2b5aa7f
+refs/heads/master: 3333590e94262aebb5d0fb767cc7ed8b2359705c
diff --git a/trunk/net/mac80211/ieee80211.c b/trunk/net/mac80211/ieee80211.c
index 505af1f067ab..6378850d8580 100644
--- a/trunk/net/mac80211/ieee80211.c
+++ b/trunk/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;