From 3cceb8afd8f611347a878a3c180d25c787d0d7c3 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 28 Oct 2008 07:28:16 +0000
Subject: [PATCH] Added atheros injection patches (from aircrack)

svn path=/nixpkgs/trunk/; revision=13127
---
 pkgs/os-specific/linux/atheros/inj.patch | 32 ++++++++++++++++++++++++
 pkgs/os-specific/linux/atheros/r3837.nix |  6 ++++-
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/os-specific/linux/atheros/inj.patch

diff --git a/pkgs/os-specific/linux/atheros/inj.patch b/pkgs/os-specific/linux/atheros/inj.patch
new file mode 100644
index 000000000000..baae9b88aa4a
--- /dev/null
+++ b/pkgs/os-specific/linux/atheros/inj.patch
@@ -0,0 +1,32 @@
+diff -Naur madwifi/ath/if_ath.c madwifi_rawtx/ath/if_ath.c
+--- madwifi/ath/if_ath.c	2008-06-24 17:20:58.000000000 -0400
++++ madwifi_rawtx/ath/if_ath.c	2008-06-24 17:20:12.000000000 -0400
+@@ -2950,6 +2950,7 @@
+ ath_tx_startraw(struct net_device *dev, struct ath_buf *bf, struct sk_buff *skb)
+ {
+ 	struct ath_softc *sc = dev->priv;
++	struct ieee80211com *ic = &sc->sc_ic;
+ 	struct ath_hal *ah = sc->sc_ah;
+ 	struct ieee80211_phy_params *ph = &(SKB_CB(skb)->phy); 
+ 	const HAL_RATE_TABLE *rt;
+@@ -2962,7 +2963,8 @@
+ 	struct ieee80211_frame *wh;
+ 
+ 	wh = (struct ieee80211_frame *)skb->data;
+-	try0 = ph->try[0];
++//	try0 = ph->try[0];
++	try0 = (ic->ic_opmode == IEEE80211_M_MONITOR) ? 1 : ph->try[0];
+ 	rt = sc->sc_currates;
+ 	txrate = dot11_to_ratecode(sc, rt, ph->rate[0]);
+ 	power = ph->power > 60 ? 60 : ph->power;
+@@ -2986,7 +2988,8 @@
+ 	rt = sc->sc_currates;
+ 	KASSERT(rt != NULL, ("no rate table, mode %u", sc->sc_curmode));
+ 
+-	if (IEEE80211_IS_MULTICAST(wh->i_addr1)) {
++	if (IEEE80211_IS_MULTICAST(wh->i_addr1) || ((ic->ic_opmode == 
++IEEE80211_M_MONITOR) && (skb->data[1]&3) != 0x01) ) {
+ 		flags |= HAL_TXDESC_NOACK;	/* no ack on broad/multicast */
+ 		sc->sc_stats.ast_tx_noack++;
+ 		try0 = 1;
+
diff --git a/pkgs/os-specific/linux/atheros/r3837.nix b/pkgs/os-specific/linux/atheros/r3837.nix
index 24cc66d8eb4c..080fdb430881 100644
--- a/pkgs/os-specific/linux/atheros/r3837.nix
+++ b/pkgs/os-specific/linux/atheros/r3837.nix
@@ -12,6 +12,7 @@ args : with args;
 		  url = http://people.freebsd.org/~sam/ath_hal-20080528.tgz;
 		  sha256 = "1a6glkd8n46876hl48ib08p81qwsvrk4153j4b9xrxgid6f8bar9";
 		};
+		injectionPatchFile = ./inj.patch;
 	};
 	in with localDefs;
 let
@@ -27,12 +28,15 @@ postInstall = FullDepEntry (''
 in
 stdenv.mkDerivation rec {
 	name = "atheros-"+version;
+	patches = lib.optional
+		(lib.getAttr ["injectionPatch"] false args)
+		injectionPatchFile;
 	builder = writeScript (name + "-builder")
 		(textClosure localDefs 
 			((lib.optional 
 				(lib.getAttr ["freshHAL"] false args)
 				preBuild)
-			++ [doMakeInstall postInstall
+			++ [doPatch doMakeInstall postInstall
 			doForceShare doPropagate]));
 	meta = {
 		description = "