diff options
| author | Dave Jones <davej@redhat.com> | 2013-02-12 11:34:47 -0500 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2013-02-12 11:34:47 -0500 |
| commit | 5cd7274d5da0f8908f8cca2f25c841c86f6a14bf (patch) | |
| tree | a67d01e466e052edabb49d1d55c098f870248887 | |
| parent | 79353e61f276ea056d04d2d8b1f7fde118d59567 (diff) | |
| download | kernel-5cd7274d5da0f8908f8cca2f25c841c86f6a14bf.tar.gz kernel-5cd7274d5da0f8908f8cca2f25c841c86f6a14bf.tar.xz kernel-5cd7274d5da0f8908f8cca2f25c841c86f6a14bf.zip | |
remove experiment
| -rw-r--r-- | brcmsmac-double-timeout.patch | 39 | ||||
| -rw-r--r-- | kernel.spec | 5 |
2 files changed, 0 insertions, 44 deletions
diff --git a/brcmsmac-double-timeout.patch b/brcmsmac-double-timeout.patch deleted file mode 100644 index adb718d83..000000000 --- a/brcmsmac-double-timeout.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/drivers/net/wireless/brcm80211/brcmsmac/main.c b/drivers/net/wireless/brcm80211/brcmsmac/main.c -index 17594de..a86d689 100644 ---- a/drivers/net/wireless/brcm80211/brcmsmac/main.c -+++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c -@@ -7518,7 +7518,7 @@ int brcms_c_get_curband(struct brcms_c_info *wlc) - return wlc->band->bandunit; - } - --void brcms_c_wait_for_tx_completion(struct brcms_c_info *wlc, bool drop) -+static int __brcms_c_wait_for_tx_completion(struct brcms_c_info *wlc, bool drop) - { - int timeout = 20; - int i; -@@ -7536,9 +7536,25 @@ void brcms_c_wait_for_tx_completion(struct brcms_c_info *wlc, bool drop) - break; - } - -+ return timeout; -+} -+ -+void brcms_c_wait_for_tx_completion(struct brcms_c_info *wlc, bool drop) -+{ -+ int timeout; -+ -+ timeout = __brcms_c_wait_for_tx_completion(wlc, drop); -+ if (timeout != 0) -+ return; -+ -+ /* Retry. */ -+ printk(KERN_INFO "brcms_c_wait_for_tx_completion took > 20ms. Retrying.\n"); -+ timeout = __brcms_c_wait_for_tx_completion(wlc, drop); -+ - WARN_ON_ONCE(timeout == 0); - } - -+ - void brcms_c_set_beacon_listen_interval(struct brcms_c_info *wlc, u8 interval) - { - wlc->bcn_li_bcn = interval; diff --git a/kernel.spec b/kernel.spec index bc2b9816f..5c76b30bf 100644 --- a/kernel.spec +++ b/kernel.spec @@ -691,8 +691,6 @@ Patch2899: v4l-dvb-fixes.patch Patch2900: v4l-dvb-update.patch Patch2901: v4l-dvb-experimental.patch -Patch3000: brcmsmac-double-timeout.patch - # fs fixes # NFSv4 @@ -1410,9 +1408,6 @@ ApplyOptionalPatch v4l-dvb-fixes.patch ApplyOptionalPatch v4l-dvb-update.patch ApplyOptionalPatch v4l-dvb-experimental.patch -# Experiment: Double the length of the brcmsmac transmit timeout. -#pplyPatch brcmsmac-double-timeout.patch - # Patches headed upstream ApplyPatch fs-proc-devtree-remove_proc_entry.patch |