---

yaml --- r: 314046 b: refs/heads/master c: 2eb278e h: refs/heads/master v: v3
git-mirror · Jun 6, 2012 · e60115d · e60115d
1 parent 26d98dc
commit e60115d
Show file tree

Hide file tree

Showing 11 changed files with 533 additions and 755 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 196ac1c13d4db6c276dbb1c9190c8d7d45a83f1f
+refs/heads/master: 2eb278e083549f4eb29838037004054b3b55df62
diff --git a/trunk/include/net/mac80211.h b/trunk/include/net/mac80211.h
@@ -2184,9 +2184,6 @@ enum ieee80211_rate_control_changed {
  *	normally except for the %IEEE80211_TX_CTL_TX_OFFCHAN flag. When the
  *	duration (which will always be non-zero) expires, the driver must call
  *	ieee80211_remain_on_channel_expired().
- *	The driver must not call ieee80211_remain_on_channel_expired() before
- *	the TX status for a frame that was sent off-channel, otherwise the TX
- *	status is reported to userspace in an invalid way.
  *	Note that this callback may be called while the device is in IDLE and
  *	must be accepted in this case.
  *	This callback may sleep.

diff --git a/trunk/net/mac80211/Makefile b/trunk/net/mac80211/Makefile
@@ -9,7 +9,6 @@ mac80211-y := \
 	scan.o offchannel.o \
 	ht.o agg-tx.o agg-rx.o \
 	ibss.o \
-	work.o \
 	iface.o \
 	rate.o \
 	michael.o \