From ddc3d068a5eeb898c5674a6e2b77383738da739b Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Tue, 13 Jul 2010 14:06:43 -0700 Subject: [PATCH] compat-wireless: refresh patches Signed-off-by: Luis R. Rodriguez --- patches/01-netdev.patch | 2 +- patches/03-rfkill.patch | 2 +- patches/08-rename-iwl4965-config.patch | 2 +- patches/16-bluetooth.patch | 4 ++-- patches/19-kfifo.patch | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/patches/01-netdev.patch b/patches/01-netdev.patch index 995b0b9a21df..bec8e581ef9a 100644 --- a/patches/01-netdev.patch +++ b/patches/01-netdev.patch @@ -228,7 +228,7 @@ without creating a headache on maintenance of the pathes. wdev->netdev = ndev; --- a/drivers/net/wireless/libertas/main.c +++ b/drivers/net/wireless/libertas/main.c -@@ -866,7 +866,7 @@ struct lbs_private *lbs_add_card(void *c +@@ -836,7 +836,7 @@ struct lbs_private *lbs_add_card(void *c wdev->netdev = dev; priv->dev = dev; diff --git a/patches/03-rfkill.patch b/patches/03-rfkill.patch index 8824d2761d40..236891d56caa 100644 --- a/patches/03-rfkill.patch +++ b/patches/03-rfkill.patch @@ -208,7 +208,7 @@ This would do the policing from within mac80211. #include --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c -@@ -2191,7 +2191,7 @@ int ath9k_hw_fill_cap_info(struct ath_hw +@@ -2193,7 +2193,7 @@ int ath9k_hw_fill_cap_info(struct ath_hw pCap->hw_caps |= ATH9K_HW_CAP_ENHANCEDPM; diff --git a/patches/08-rename-iwl4965-config.patch b/patches/08-rename-iwl4965-config.patch index 11cb536a9097..3a6b38c03215 100644 --- a/patches/08-rename-iwl4965-config.patch +++ b/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 +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c -@@ -4194,10 +4194,10 @@ static void __devexit iwl_pci_remove(str +@@ -4218,10 +4218,10 @@ static void __devexit iwl_pci_remove(str /* Hardware specific file defines the PCI IDs table for that hardware module */ static DEFINE_PCI_DEVICE_TABLE(iwl_hw_card_ids) = { diff --git a/patches/16-bluetooth.patch b/patches/16-bluetooth.patch index 8c58c84e3303..62717c7d46eb 100644 --- a/patches/16-bluetooth.patch +++ b/patches/16-bluetooth.patch @@ -17,8 +17,8 @@ here still, but for now we keep this here. tty_driver_flush_buffer(tty); return 0; -@@ -476,7 +481,11 @@ static int hci_uart_tty_ioctl(struct tty - return -EUNATCH; +@@ -488,7 +493,11 @@ static int hci_uart_tty_ioctl(struct tty + return hu->hdev_flags; default: +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,27)) diff --git a/patches/19-kfifo.patch b/patches/19-kfifo.patch index 66a0287d4e21..a49783be6f19 100644 --- a/patches/19-kfifo.patch +++ b/patches/19-kfifo.patch @@ -17,7 +17,7 @@ not be backported easily with defines in the compat module. struct task_struct *main_thread; --- a/drivers/net/wireless/libertas/main.c +++ b/drivers/net/wireless/libertas/main.c -@@ -788,8 +788,14 @@ static int lbs_init_adapter(struct lbs_p +@@ -758,8 +758,14 @@ static int lbs_init_adapter(struct lbs_p priv->resp_len[0] = priv->resp_len[1] = 0; /* Create the event FIFO */ @@ -32,7 +32,7 @@ not be backported easily with defines in the compat module. lbs_pr_err("Out of memory allocating event FIFO buffer\n"); goto out; } -@@ -805,7 +811,12 @@ static void lbs_free_adapter(struct lbs_ +@@ -775,7 +781,12 @@ static void lbs_free_adapter(struct lbs_ lbs_deb_enter(LBS_DEB_MAIN); lbs_free_cmd_buffer(priv); -- 2.30.2