diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-11-29 13:43:37 +0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-11-29 13:43:37 +0100 |
commit | 5553546c212152a9cea72e1398b088cda78c7b8b (patch) | |
tree | 64dd2cc6af447ccf1ff81637fe4a7f632603e9f8 /pkgs/os-specific/linux/atheros | |
parent | f04aa4fb59e7c41f75762042080b7ccffb93167e (diff) | |
download | nixlib-5553546c212152a9cea72e1398b088cda78c7b8b.tar nixlib-5553546c212152a9cea72e1398b088cda78c7b8b.tar.gz nixlib-5553546c212152a9cea72e1398b088cda78c7b8b.tar.bz2 nixlib-5553546c212152a9cea72e1398b088cda78c7b8b.tar.lz nixlib-5553546c212152a9cea72e1398b088cda78c7b8b.tar.xz nixlib-5553546c212152a9cea72e1398b088cda78c7b8b.tar.zst nixlib-5553546c212152a9cea72e1398b088cda78c7b8b.zip |
Remove a bunch of unreferenced files
Plus a small number of obsolete packages (like old versions of qemu).
Diffstat (limited to 'pkgs/os-specific/linux/atheros')
-rw-r--r-- | pkgs/os-specific/linux/atheros/inj.patch | 32 | ||||
-rw-r--r-- | pkgs/os-specific/linux/atheros/r3867.nix | 45 |
2 files changed, 0 insertions, 77 deletions
diff --git a/pkgs/os-specific/linux/atheros/inj.patch b/pkgs/os-specific/linux/atheros/inj.patch deleted file mode 100644 index baae9b88aa4a..000000000000 --- a/pkgs/os-specific/linux/atheros/inj.patch +++ /dev/null @@ -1,32 +0,0 @@ -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/r3867.nix b/pkgs/os-specific/linux/atheros/r3867.nix deleted file mode 100644 index 95a834dd67aa..000000000000 --- a/pkgs/os-specific/linux/atheros/r3867.nix +++ /dev/null @@ -1,45 +0,0 @@ -args : with args; - let localDefs = builderDefs.passthru.function { - src = fetchurl { - url = http://snapshots.madwifi.org/madwifi-trunk/madwifi-trunk-r3867-20080924.tar.gz; - sha256 = "0m48p5mqx1d3aimjjiy251fii7x7y15ch5n74hvq4hygc6bcjf79"; - }; - - buildInputs = []; - configureFlags = []; - makeFlags = [''KERNELPATH=${kernel}/lib/modules/*/build'' ''DESTDIR=$out'']; - hal20080528 = fetchurl { - url = http://people.freebsd.org/~sam/ath_hal-20080528.tgz; - sha256 = "1a6glkd8n46876hl48ib08p81qwsvrk4153j4b9xrxgid6f8bar9"; - }; - injectionPatchFile = ./inj.patch; - }; - in with localDefs; -let -preBuild = fullDepEntry ('' - echo Replacing HAL. - tar xvf ${hal20080528} - rm -r hal - mv ath_hal-* hal -'') ["minInit" "doUnpack"]; -postInstall = fullDepEntry ('' - ln -s $out/usr/local/bin $out/bin -'') [minInit doMakeInstall]; -in -stdenv.mkDerivation rec { - name = "atheros-"+version; - patches = lib.optional - (lib.attrByPath ["injectionPatch"] false args) - injectionPatchFile; - builder = writeScript (name + "-builder") - (textClosure localDefs - ((lib.optional - (lib.attrByPath ["freshHAL"] false args) - preBuild) - ++ [doPatch doMakeInstall postInstall - doForceShare doPropagate])); - meta = { - description = "Atheros WiFi driver"; - inherit src; - }; -} |