All of lore.kernel.org
 help / color / mirror / Atom feed
From: Hauke Mehrtens <hauke@hauke-m.de>
To: lrodriguez@atheros.com
Cc: linux-wireless@vger.kernel.org, Hauke Mehrtens <hauke@hauke-m.de>
Subject: [PATCH 3/4] refresh patches
Date: Sun,  8 Nov 2009 23:27:10 +0100	[thread overview]
Message-ID: <1257719231-2031-4-git-send-email-hauke@hauke-m.de> (raw)
In-Reply-To: <1257719231-2031-1-git-send-email-hauke@hauke-m.de>

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 compat/patches/01-netdev.patch                  |    2 +-
 compat/patches/08-rename-iwl4965-config.patch   |    2 +-
 compat/patches/09-threaded-irq.patch            |    2 +-
 compat/patches/15-symbol-export-conflicts.patch |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/compat/patches/01-netdev.patch b/compat/patches/01-netdev.patch
index 0a858f2..2048348 100644
--- a/compat/patches/01-netdev.patch
+++ b/compat/patches/01-netdev.patch
@@ -511,7 +511,7 @@ without creating a headache on maintenance of the pathes.
  #define LBS_DEB_LEAVE	0x00000002
 --- a/drivers/net/wireless/mac80211_hwsim.c	2009-08-18 16:18:52.829350750 -0700
 +++ b/drivers/net/wireless/mac80211_hwsim.c	2009-08-18 16:18:52.977352457 -0700
-@@ -816,16 +816,22 @@
+@@ -872,16 +872,22 @@
  	.name = "mac80211_hwsim"
  };
  
diff --git a/compat/patches/08-rename-iwl4965-config.patch b/compat/patches/08-rename-iwl4965-config.patch
index 3b90c0f..78a6b6f 100644
--- a/compat/patches/08-rename-iwl4965-config.patch
+++ b/compat/patches/08-rename-iwl4965-config.patch
@@ -16,7 +16,7 @@ CONFIG_IWL4965 has to be set to y, to build correctly.
  iwlagn-$(CONFIG_IWL5000) += iwl-1000.o
 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c	2009-11-02 08:07:33.000000000 -0800
 +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c	2009-11-02 08:07:33.000000000 -0800
-@@ -3323,10 +3323,10 @@
+@@ -3416,10 +3416,10 @@
  
  /* Hardware specific file defines the PCI IDs table for that hardware module */
  static struct pci_device_id iwl_hw_card_ids[] = {
diff --git a/compat/patches/09-threaded-irq.patch b/compat/patches/09-threaded-irq.patch
index e59cafc..a5aace6 100644
--- a/compat/patches/09-threaded-irq.patch
+++ b/compat/patches/09-threaded-irq.patch
@@ -51,7 +51,7 @@ thread in process context as well.
  	b43_release_firmware(dev);
 --- a/drivers/net/wireless/b43/b43.h	2009-10-19 11:36:44.000000000 +0900
 +++ b/drivers/net/wireless/b43/b43.h	2009-10-19 11:36:45.000000000 +0900
-@@ -747,6 +747,9 @@
+@@ -745,6 +745,9 @@
  	unsigned int tx_count;
  	unsigned int rx_count;
  #endif
diff --git a/compat/patches/15-symbol-export-conflicts.patch b/compat/patches/15-symbol-export-conflicts.patch
index 70ff4c9..1f2e9e6 100644
--- a/compat/patches/15-symbol-export-conflicts.patch
+++ b/compat/patches/15-symbol-export-conflicts.patch
@@ -3,7 +3,7 @@ To avoid conflicts with the other export we rename our.
 
 --- a/net/mac80211/rx.c	2009-11-02 08:08:54.000000000 -0800
 +++ b/net/mac80211/rx.c	2009-11-02 08:08:55.000000000 -0800
-@@ -2536,7 +2536,12 @@
+@@ -2480,7 +2480,12 @@
   drop:
  	kfree_skb(skb);
  }
-- 
1.6.3.3


  parent reply	other threads:[~2009-11-08 22:27 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-11-08 22:27 [PATCH 0/4] *** SUBJECT HERE *** Hauke Mehrtens
2009-11-08 22:27 ` [PATCH 1/4] Fix build problem, missing get_unaligned_le16 Hauke Mehrtens
2009-11-08 22:27 ` [PATCH 2/4] Fix two warnings Hauke Mehrtens
2009-11-08 22:27 ` Hauke Mehrtens [this message]
2009-11-08 22:27 ` [PATCH 4/4] [compat-2.6] Add symbol CONFIG_RT2800_LIB Hauke Mehrtens

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1257719231-2031-4-git-send-email-hauke@hauke-m.de \
    --to=hauke@hauke-m.de \
    --cc=linux-wireless@vger.kernel.org \
    --cc=lrodriguez@atheros.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.