compat-wireless: refresh patches

Signed-off-by: Luis R. Rodriguez <mcgrof@frijolero.org>

17 files changed, 75 insertions, 75 deletions

diff --git a/patches/01-netdev.patch b/patches/01-netdev.patch
index e66bcd4c..9b4e7f1c 100644
--- a/patches/01-netdev.patch
+++ b/patches/01-netdev.patch
@@ -347,7 +347,7 @@ without creating a headache on maintenance of the pathes.
  	atl1e_set_ethtool_ops(netdev);
 --- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
 +++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
-@@ -2620,7 +2620,7 @@ static int atl1c_init_netdev(struct net_
+@@ -2617,7 +2617,7 @@ static int atl1c_init_netdev(struct net_
  	pci_set_drvdata(pdev, netdev);
  
  	netdev->irq  = pdev->irq;
@@ -358,7 +358,7 @@ without creating a headache on maintenance of the pathes.
  
 --- a/drivers/net/ethernet/atheros/atlx/atl1.c
 +++ b/drivers/net/ethernet/atheros/atlx/atl1.c
-@@ -2966,7 +2966,7 @@ static int __devinit atl1_probe(struct p
+@@ -2969,7 +2969,7 @@ static int __devinit atl1_probe(struct p
  	adapter->mii.phy_id_mask = 0x1f;
  	adapter->mii.reg_num_mask = 0x1f;
  
diff --git a/patches/04-netns.patch b/patches/04-netns.patch
index 5ab4334e..e8308fba 100644
--- a/patches/04-netns.patch
+++ b/patches/04-netns.patch
@@ -6,7 +6,7 @@ files...
 
 --- a/net/wireless/nl80211.c
 +++ b/net/wireless/nl80211.c
-@@ -5165,7 +5165,9 @@ static int nl80211_wiphy_netns(struct sk
+@@ -5194,7 +5194,9 @@ static int nl80211_wiphy_netns(struct sk
  	if (!net_eq(wiphy_net(&rdev->wiphy), net))
  		err = cfg80211_switch_netns(rdev, net);
  
diff --git a/patches/08-rename-config-options.patch b/patches/08-rename-config-options.patch
index 8aae093a..d67a9b9b 100644
--- a/patches/08-rename-config-options.patch
+++ b/patches/08-rename-config-options.patch
@@ -35,7 +35,7 @@ CONFIG_BT_HIDP does not build with older kernel versions.
  
 --- a/drivers/net/wireless/iwlegacy/common.h
 +++ b/drivers/net/wireless/iwlegacy/common.h
-@@ -1379,7 +1379,7 @@ struct il_priv {
+@@ -1375,7 +1375,7 @@ struct il_priv {
  
  		} _3945;
  #endif
diff --git a/patches/09-cfg80211-wext-padding.patch b/patches/09-cfg80211-wext-padding.patch
index 93de568a..22b5a5ef 100644
--- a/patches/09-cfg80211-wext-padding.patch
+++ b/patches/09-cfg80211-wext-padding.patch
@@ -30,7 +30,7 @@ moved due to struct enlargements.
 
 --- a/include/net/cfg80211.h
 +++ b/include/net/cfg80211.h
-@@ -1999,6 +1999,9 @@ struct wiphy_wowlan_support {
+@@ -2009,6 +2009,9 @@ struct wiphy_wowlan_support {
  struct wiphy {
  	/* assign these fields before you register the wiphy */
  
diff --git a/patches/09-threaded-irq.patch b/patches/09-threaded-irq.patch
index 033f0282..69f02739 100644
--- a/patches/09-threaded-irq.patch
+++ b/patches/09-threaded-irq.patch
@@ -63,7 +63,7 @@ thread in process context as well.
  /* Data structure for the WLAN parts (802.11 cores) of the b43 chip. */
 --- a/drivers/net/wireless/wl12xx/main.c
 +++ b/drivers/net/wireless/wl12xx/main.c
-@@ -5181,14 +5181,25 @@ static int __devinit wl12xx_probe(struct
+@@ -5439,14 +5439,25 @@ static int __devinit wl12xx_probe(struct
  
  	platform_set_drvdata(pdev, wl);
  
@@ -89,7 +89,7 @@ thread in process context as well.
  	if (ret < 0) {
  		wl1271_error("request_irq() failed: %d", ret);
  		goto out_free_hw;
-@@ -5242,7 +5253,11 @@ out_bt_coex_state:
+@@ -5500,7 +5511,11 @@ out_bt_coex_state:
  	device_remove_file(wl->dev, &dev_attr_bt_coex_state);
  
  out_irq:
@@ -101,7 +101,7 @@ thread in process context as well.
  
  out_free_hw:
  	wl1271_free_hw(wl);
-@@ -5260,7 +5275,12 @@ static int __devexit wl12xx_remove(struc
+@@ -5518,7 +5533,12 @@ static int __devexit wl12xx_remove(struc
  		disable_irq_wake(wl->irq);
  	}
  	wl1271_unregister_hw(wl);
@@ -116,7 +116,7 @@ thread in process context as well.
  	return 0;
 --- a/drivers/net/wireless/wl12xx/wl12xx.h
 +++ b/drivers/net/wireless/wl12xx/wl12xx.h
-@@ -477,6 +477,10 @@ struct wl1271 {
+@@ -495,6 +495,10 @@ struct wl1271 {
  
  	/* last wlvif we transmitted from */
  	struct wl12xx_vif *last_wlvif;
diff --git a/patches/11-dev-pm-ops.patch b/patches/11-dev-pm-ops.patch
index 05d2833d..619cd00f 100644
--- a/patches/11-dev-pm-ops.patch
+++ b/patches/11-dev-pm-ops.patch
@@ -35,7 +35,7 @@ calls on compat code with only slight modifications.
  int __init bcma_host_pci_init(void)
 --- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
 +++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
-@@ -2899,6 +2899,9 @@ static struct pci_error_handlers atl1c_e
+@@ -2894,6 +2894,9 @@ static struct pci_error_handlers atl1c_e
  
  static SIMPLE_DEV_PM_OPS(atl1c_pm_ops, atl1c_suspend, atl1c_resume);
  
@@ -45,7 +45,7 @@ calls on compat code with only slight modifications.
  static struct pci_driver atl1c_driver = {
  	.name     = atl1c_driver_name,
  	.id_table = atl1c_pci_tbl,
-@@ -2906,7 +2909,12 @@ static struct pci_driver atl1c_driver =
+@@ -2901,7 +2904,12 @@ static struct pci_driver atl1c_driver =
  	.remove   = __devexit_p(atl1c_remove),
  	.shutdown = atl1c_shutdown,
  	.err_handler = &atl1c_err_handler,
@@ -60,7 +60,7 @@ calls on compat code with only slight modifications.
  /*
 --- a/drivers/net/ethernet/atheros/atlx/atl1.c
 +++ b/drivers/net/ethernet/atheros/atlx/atl1.c
-@@ -2833,6 +2833,9 @@ static int atl1_resume(struct device *de
+@@ -2836,6 +2836,9 @@ static int atl1_resume(struct device *de
  	return 0;
  }
  
@@ -70,7 +70,7 @@ calls on compat code with only slight modifications.
  static SIMPLE_DEV_PM_OPS(atl1_pm_ops, atl1_suspend, atl1_resume);
  #define ATL1_PM_OPS	(&atl1_pm_ops)
  
-@@ -3102,7 +3105,12 @@ static struct pci_driver atl1_driver = {
+@@ -3108,7 +3111,12 @@ static struct pci_driver atl1_driver = {
  	.probe = atl1_probe,
  	.remove = __devexit_p(atl1_remove),
  	.shutdown = atl1_shutdown,
@@ -144,7 +144,7 @@ calls on compat code with only slight modifications.
  int ath_pci_init(void)
 --- a/drivers/net/wireless/iwlegacy/3945-mac.c
 +++ b/drivers/net/wireless/iwlegacy/3945-mac.c
-@@ -3885,7 +3885,12 @@ static struct pci_driver il3945_driver =
+@@ -3883,7 +3883,12 @@ static struct pci_driver il3945_driver =
  	.id_table = il3945_hw_card_ids,
  	.probe = il3945_pci_probe,
  	.remove = __devexit_p(il3945_pci_remove),
@@ -159,7 +159,7 @@ calls on compat code with only slight modifications.
  static int __init
 --- a/drivers/net/wireless/iwlegacy/4965-mac.c
 +++ b/drivers/net/wireless/iwlegacy/4965-mac.c
-@@ -6479,7 +6479,12 @@ static struct pci_driver il4965_driver =
+@@ -6760,7 +6760,12 @@ static struct pci_driver il4965_driver =
  	.id_table = il4965_hw_card_ids,
  	.probe = il4965_pci_probe,
  	.remove = __devexit_p(il4965_pci_remove),
@@ -174,7 +174,7 @@ calls on compat code with only slight modifications.
  static int __init
 --- a/drivers/net/wireless/iwlegacy/common.c
 +++ b/drivers/net/wireless/iwlegacy/common.c
-@@ -5123,15 +5123,17 @@ il_pci_resume(struct device *device)
+@@ -4900,15 +4900,17 @@ il_pci_resume(struct device *device)
  }
  EXPORT_SYMBOL(il_pci_resume);
  
@@ -202,7 +202,7 @@ calls on compat code with only slight modifications.
  
 --- a/drivers/net/wireless/iwlegacy/common.h
 +++ b/drivers/net/wireless/iwlegacy/common.h
-@@ -1964,7 +1964,12 @@ __le32 il_add_beacon_time(struct il_priv
+@@ -1870,7 +1870,12 @@ __le32 il_add_beacon_time(struct il_priv
  #ifdef CONFIG_PM
  int il_pci_suspend(struct device *device);
  int il_pci_resume(struct device *device);
@@ -336,7 +336,7 @@ calls on compat code with only slight modifications.
  /* add global spin lock to solve the problem that
 --- a/drivers/net/wireless/rtlwifi/rtl8192se/sw.c
 +++ b/drivers/net/wireless/rtlwifi/rtl8192se/sw.c
-@@ -432,21 +432,22 @@ MODULE_PARM_DESC(swlps, "Set to 1 to use
+@@ -433,21 +433,22 @@ MODULE_PARM_DESC(swlps, "Set to 1 to use
  MODULE_PARM_DESC(fwlps, "Set to 1 to use FW control power save (default 1)\n");
  MODULE_PARM_DESC(debug, "Set debug level (0-5) (default 0)");
  
diff --git a/patches/16-bluetooth.patch b/patches/16-bluetooth.patch
index 3397b2d8..3a218c43 100644
--- a/patches/16-bluetooth.patch
+++ b/patches/16-bluetooth.patch
@@ -94,7 +94,7 @@ here still, but for now we keep this here.
  	wake_up_process(session->task);
 --- a/net/bluetooth/hci_sock.c
 +++ b/net/bluetooth/hci_sock.c
-@@ -564,7 +564,11 @@ drop:
+@@ -891,7 +891,11 @@ drop:
  	goto done;
  }
  
@@ -106,7 +106,7 @@ here still, but for now we keep this here.
  {
  	struct hci_ufilter uf = { .opcode = 0 };
  	struct sock *sk = sock->sk;
-@@ -719,8 +723,12 @@ static struct proto hci_sk_proto = {
+@@ -1063,8 +1067,12 @@ static struct proto hci_sk_proto = {
  	.obj_size	= sizeof(struct hci_pinfo)
  };
  
@@ -133,7 +133,7 @@ here still, but for now we keep this here.
  	&bt_link_group,
  	NULL
  };
-@@ -143,7 +147,11 @@ void hci_conn_del_sysfs(struct hci_conn
+@@ -141,7 +145,11 @@ void hci_conn_del_sysfs(struct hci_conn
  		dev = device_find_child(&conn->dev, NULL, __match_tty);
  		if (!dev)
  			break;
@@ -145,7 +145,7 @@ here still, but for now we keep this here.
  		put_device(dev);
  	}
  
-@@ -363,7 +371,11 @@ static struct attribute_group bt_host_gr
+@@ -361,7 +369,11 @@ static struct attribute_group bt_host_gr
  	.attrs = bt_host_attrs,
  };
  
@@ -605,7 +605,7 @@ here still, but for now we keep this here.
  {
  	struct sock *sk = sock->sk;
  	struct l2cap_chan *chan = l2cap_pi(sk)->chan;
-@@ -1022,8 +1029,12 @@ static struct sock *l2cap_sock_alloc(str
+@@ -1043,8 +1050,12 @@ static struct sock *l2cap_sock_alloc(str
  	return sk;
  }
  
@@ -618,7 +618,7 @@ here still, but for now we keep this here.
  {
  	struct sock *sk;
  
-@@ -1035,7 +1046,11 @@ static int l2cap_sock_create(struct net
+@@ -1056,7 +1067,11 @@ static int l2cap_sock_create(struct net
  			sock->type != SOCK_DGRAM && sock->type != SOCK_RAW)
  		return -ESOCKTNOSUPPORT;
  
diff --git a/patches/24-pcmcia.patch b/patches/24-pcmcia.patch
index 353a267b..9e7990c5 100644
--- a/patches/24-pcmcia.patch
+++ b/patches/24-pcmcia.patch
@@ -227,7 +227,7 @@
  
  	spin_lock(&(info->lock));
  
-@@ -479,7 +491,11 @@ static int bt3c_load_firmware(bt3c_info_
+@@ -474,7 +486,11 @@ static int bt3c_load_firmware(bt3c_info_
  	unsigned int iobase, size, addr, fcs, tmp;
  	int i, err = 0;
  
@@ -239,7 +239,7 @@
  
  	/* Reset */
  	bt3c_io_write(iobase, 0x8040, 0x0404);
-@@ -654,8 +670,27 @@ static int bt3c_probe(struct pcmcia_devi
+@@ -646,8 +662,27 @@ static int bt3c_probe(struct pcmcia_devi
  	info->p_dev = link;
  	link->priv = info;
  
@@ -267,7 +267,7 @@
  
  	return bt3c_config(link);
  }
-@@ -669,6 +704,7 @@ static void bt3c_detach(struct pcmcia_de
+@@ -661,6 +696,7 @@ static void bt3c_detach(struct pcmcia_de
  	kfree(info);
  }
  
@@ -275,7 +275,7 @@
  static int bt3c_check_config(struct pcmcia_device *p_dev, void *priv_data)
  {
  	int *try = priv_data;
-@@ -707,6 +743,63 @@ static int bt3c_check_config_notpicky(st
+@@ -699,6 +735,63 @@ static int bt3c_check_config_notpicky(st
  	}
  	return -ENODEV;
  }
@@ -339,7 +339,7 @@
  
  static int bt3c_config(struct pcmcia_device *link)
  {
-@@ -730,9 +823,15 @@ static int bt3c_config(struct pcmcia_dev
+@@ -722,9 +815,15 @@ static int bt3c_config(struct pcmcia_dev
  	goto failed;
  
  found_port:
@@ -355,7 +355,7 @@
  
  	i = pcmcia_enable_device(link);
  	if (i != 0)
-@@ -767,7 +866,13 @@ MODULE_DEVICE_TABLE(pcmcia, bt3c_ids);
+@@ -759,7 +858,13 @@ MODULE_DEVICE_TABLE(pcmcia, bt3c_ids);
  
  static struct pcmcia_driver bt3c_driver = {
  	.owner		= THIS_MODULE,
@@ -419,7 +419,7 @@
  
  	spin_lock_irqsave(&(info->lock), flags);
  
-@@ -477,7 +493,11 @@ static int btuart_hci_ioctl(struct hci_d
+@@ -472,7 +488,11 @@ static int btuart_hci_ioctl(struct hci_d
  static int btuart_open(btuart_info_t *info)
  {
  	unsigned long flags;
@@ -431,7 +431,7 @@
  	struct hci_dev *hdev;
  
  	spin_lock_init(&(info->lock));
-@@ -547,7 +567,11 @@ static int btuart_open(btuart_info_t *in
+@@ -539,7 +559,11 @@ static int btuart_open(btuart_info_t *in
  static int btuart_close(btuart_info_t *info)
  {
  	unsigned long flags;
@@ -443,7 +443,7 @@
  	struct hci_dev *hdev = info->hdev;
  
  	if (!hdev)
-@@ -583,8 +607,27 @@ static int btuart_probe(struct pcmcia_de
+@@ -575,8 +599,27 @@ static int btuart_probe(struct pcmcia_de
  	info->p_dev = link;
  	link->priv = info;
  
@@ -471,7 +471,7 @@
  
  	return btuart_config(link);
  }
-@@ -598,6 +641,7 @@ static void btuart_detach(struct pcmcia_
+@@ -590,6 +633,7 @@ static void btuart_detach(struct pcmcia_
  	kfree(info);
  }
  
@@ -479,7 +479,7 @@
  static int btuart_check_config(struct pcmcia_device *p_dev, void *priv_data)
  {
  	int *try = priv_data;
-@@ -636,6 +680,63 @@ static int btuart_check_config_notpicky(
+@@ -628,6 +672,63 @@ static int btuart_check_config_notpicky(
  	}
  	return -ENODEV;
  }
@@ -543,7 +543,7 @@
  
  static int btuart_config(struct pcmcia_device *link)
  {
-@@ -659,9 +760,15 @@ static int btuart_config(struct pcmcia_d
+@@ -651,9 +752,15 @@ static int btuart_config(struct pcmcia_d
  	goto failed;
  
  found_port:
@@ -559,7 +559,7 @@
  
  	i = pcmcia_enable_device(link);
  	if (i != 0)
-@@ -695,7 +802,13 @@ MODULE_DEVICE_TABLE(pcmcia, btuart_ids);
+@@ -687,7 +794,13 @@ MODULE_DEVICE_TABLE(pcmcia, btuart_ids);
  
  static struct pcmcia_driver btuart_driver = {
  	.owner		= THIS_MODULE,
@@ -575,7 +575,7 @@
  	.id_table	= btuart_ids,
 --- a/drivers/bluetooth/dtl1_cs.c
 +++ b/drivers/bluetooth/dtl1_cs.c
-@@ -148,7 +148,11 @@ static void dtl1_write_wakeup(dtl1_info_
+@@ -145,7 +145,11 @@ static void dtl1_write_wakeup(dtl1_info_
  	}
  
  	do {
@@ -587,7 +587,7 @@
  		register struct sk_buff *skb;
  		register int len;
  
-@@ -213,7 +217,11 @@ static void dtl1_receive(dtl1_info_t *in
+@@ -210,7 +214,11 @@ static void dtl1_receive(dtl1_info_t *in
  		return;
  	}
  
@@ -599,7 +599,7 @@
  
  	do {
  		info->hdev->stat.byte_rx++;
-@@ -300,7 +308,11 @@ static irqreturn_t dtl1_interrupt(int ir
+@@ -297,7 +305,11 @@ static irqreturn_t dtl1_interrupt(int ir
  		/* our irq handler is shared */
  		return IRQ_NONE;
  
@@ -611,7 +611,7 @@
  
  	spin_lock(&(info->lock));
  
-@@ -460,7 +472,11 @@ static int dtl1_hci_ioctl(struct hci_dev
+@@ -452,7 +464,11 @@ static int dtl1_hci_ioctl(struct hci_dev
  static int dtl1_open(dtl1_info_t *info)
  {
  	unsigned long flags;
@@ -623,7 +623,7 @@
  	struct hci_dev *hdev;
  
  	spin_lock_init(&(info->lock));
-@@ -507,8 +523,13 @@ static int dtl1_open(dtl1_info_t *info)
+@@ -496,8 +512,13 @@ static int dtl1_open(dtl1_info_t *info)
  	outb(UART_LCR_WLEN8, iobase + UART_LCR);	/* Reset DLAB */
  	outb((UART_MCR_DTR | UART_MCR_RTS | UART_MCR_OUT2), iobase + UART_MCR);
  
@@ -637,7 +637,7 @@
  
  	/* Turn on interrupts */
  	outb(UART_IER_RLSI | UART_IER_RDI | UART_IER_THRI, iobase + UART_IER);
-@@ -533,7 +554,11 @@ static int dtl1_open(dtl1_info_t *info)
+@@ -522,7 +543,11 @@ static int dtl1_open(dtl1_info_t *info)
  static int dtl1_close(dtl1_info_t *info)
  {
  	unsigned long flags;
@@ -649,7 +649,7 @@
  	struct hci_dev *hdev = info->hdev;
  
  	if (!hdev)
-@@ -569,7 +594,24 @@ static int dtl1_probe(struct pcmcia_devi
+@@ -558,7 +583,24 @@ static int dtl1_probe(struct pcmcia_devi
  	info->p_dev = link;
  	link->priv = info;
  
@@ -674,7 +674,7 @@
  
  	return dtl1_config(link);
  }
-@@ -584,6 +626,7 @@ static void dtl1_detach(struct pcmcia_de
+@@ -573,6 +615,7 @@ static void dtl1_detach(struct pcmcia_de
  	kfree(info);
  }
  
@@ -682,7 +682,7 @@
  static int dtl1_confcheck(struct pcmcia_device *p_dev, void *priv_data)
  {
  	if ((p_dev->resource[1]->end) || (p_dev->resource[1]->end < 8))
-@@ -594,6 +637,29 @@ static int dtl1_confcheck(struct pcmcia_
+@@ -583,6 +626,29 @@ static int dtl1_confcheck(struct pcmcia_
  
  	return pcmcia_request_io(p_dev);
  }
@@ -712,7 +712,7 @@
  
  static int dtl1_config(struct pcmcia_device *link)
  {
-@@ -601,13 +667,23 @@ static int dtl1_config(struct pcmcia_dev
+@@ -590,13 +656,23 @@ static int dtl1_config(struct pcmcia_dev
  	int i;
  
  	/* Look for a generic full-sized window */
@@ -736,7 +736,7 @@
  
  	i = pcmcia_enable_device(link);
  	if (i != 0)
-@@ -645,7 +721,13 @@ MODULE_DEVICE_TABLE(pcmcia, dtl1_ids);
+@@ -623,7 +699,13 @@ MODULE_DEVICE_TABLE(pcmcia, dtl1_ids);
  
  static struct pcmcia_driver dtl1_driver = {
  	.owner		= THIS_MODULE,
diff --git a/patches/25-multicast-list_head.patch b/patches/25-multicast-list_head.patch
index b80ec63b..21c1657d 100644
--- a/patches/25-multicast-list_head.patch
+++ b/patches/25-multicast-list_head.patch
@@ -55,7 +55,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
  }
 --- a/drivers/net/ethernet/atheros/atlx/atlx.c
 +++ b/drivers/net/ethernet/atheros/atlx/atlx.c
-@@ -149,7 +149,11 @@ static void atlx_set_multi(struct net_de
+@@ -150,7 +150,11 @@ static void atlx_set_multi(struct net_de
  
  	/* compute mc addresses' hash value ,and put it into hash table */
  	netdev_for_each_mc_addr(ha, netdev) {
@@ -536,7 +536,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
  static void rtl8187_configure_filter(struct ieee80211_hw *dev,
 --- a/drivers/net/wireless/wl12xx/main.c
 +++ b/drivers/net/wireless/wl12xx/main.c
-@@ -2614,11 +2614,20 @@ struct wl1271_filter_params {
+@@ -2743,11 +2743,20 @@ struct wl1271_filter_params {
  	u8 mc_list[ACX_MC_ADDRESS_GROUP_MAX][ETH_ALEN];
  };
  
@@ -557,7 +557,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
  	struct wl1271 *wl = hw->priv;
  
  	if (unlikely(wl->state == WL1271_STATE_OFF))
-@@ -2631,16 +2640,40 @@ static u64 wl1271_op_prepare_multicast(s
+@@ -2760,16 +2769,40 @@ static u64 wl1271_op_prepare_multicast(s
  	}
  
  	/* update multicast filtering parameters */
diff --git a/patches/29-sdio_no_suspend.patch b/patches/29-sdio_no_suspend.patch
index 9d9f8fcd..19414e3b 100644
--- a/patches/29-sdio_no_suspend.patch
+++ b/patches/29-sdio_no_suspend.patch
@@ -14,7 +14,7 @@ suspend and resume that are not backported.
  
  /* hif layer decides what suspend mode to use */
  static int __ath6kl_cfg80211_suspend(struct wiphy *wiphy,
-@@ -2778,7 +2778,7 @@ static struct cfg80211_ops ath6kl_cfg802
+@@ -2790,7 +2790,7 @@ static struct cfg80211_ops ath6kl_cfg802
  	.del_pmksa = ath6kl_del_pmksa,
  	.flush_pmksa = ath6kl_flush_pmksa,
  	CFG80211_TESTMODE_CMD(ath6kl_tm_cmd)
@@ -205,7 +205,7 @@ suspend and resume that are not backported.
  	int retry = 0;
  	while (atomic_read(&sdiodev->suspend) && retry++ != 30)
  		wait_event_timeout(*wq, false, HZ/100);
-@@ -539,7 +539,7 @@ static void brcmf_ops_sdio_remove(struct
+@@ -540,7 +540,7 @@ static void brcmf_ops_sdio_remove(struct
  	}
  }
  
@@ -214,7 +214,7 @@ suspend and resume that are not backported.
  static int brcmf_sdio_suspend(struct device *dev)
  {
  	mmc_pm_flag_t sdio_flags;
-@@ -589,7 +589,7 @@ static struct sdio_driver brcmf_sdmmc_dr
+@@ -590,7 +590,7 @@ static struct sdio_driver brcmf_sdmmc_dr
  	.remove = brcmf_ops_sdio_remove,
  	.name = "brcmfmac",
  	.id_table = brcmf_sdmmc_ids,
diff --git a/patches/35-fix-makefile-includes.patch b/patches/35-fix-makefile-includes.patch
index 43bbcb12..a28c7687 100644
--- a/patches/35-fix-makefile-includes.patch
+++ b/patches/35-fix-makefile-includes.patch
@@ -29,8 +29,8 @@ path the make process will search in the kernel tree for the headers.
 +	-I$(obj)		\
 +	-I$(obj)/../include
  
- obj-$(CONFIG_BRCMFMAC) += brcmfmac.o
- brcmfmac-objs += \
+ ccflags-y += -D__CHECK_ENDIAN__
+ 
 --- a/drivers/net/wireless/brcm80211/brcmsmac/Makefile
 +++ b/drivers/net/wireless/brcm80211/brcmsmac/Makefile
 @@ -17,9 +17,9 @@
diff --git a/patches/38-led-max-brightness.patch b/patches/38-led-max-brightness.patch
index 487124fa..87112f44 100644
--- a/patches/38-led-max-brightness.patch
+++ b/patches/38-led-max-brightness.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/iwlegacy/common.c
 +++ b/drivers/net/wireless/iwlegacy/common.c
-@@ -563,7 +563,9 @@ il_leds_init(struct il_priv *il)
+@@ -562,7 +562,9 @@ il_leds_init(struct il_priv *il)
  	    kasprintf(GFP_KERNEL, "%s-led", wiphy_name(il->hw->wiphy));
  	il->led.brightness_set = il_led_brightness_set;
  	il->led.blink_set = il_led_blink_set;
diff --git a/patches/39-remove_blink_set.patch b/patches/39-remove_blink_set.patch
index b85772a9..277cc88e 100644
--- a/patches/39-remove_blink_set.patch
+++ b/patches/39-remove_blink_set.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/iwlegacy/common.c
 +++ b/drivers/net/wireless/iwlegacy/common.c
-@@ -541,6 +541,7 @@ il_led_brightness_set(struct led_classde
+@@ -540,6 +540,7 @@ il_led_brightness_set(struct led_classde
  	il_led_cmd(il, on, 0);
  }
  
@@ -8,7 +8,7 @@
  static int
  il_led_blink_set(struct led_classdev *led_cdev, unsigned long *delay_on,
  		 unsigned long *delay_off)
-@@ -549,6 +550,7 @@ il_led_blink_set(struct led_classdev *le
+@@ -548,6 +549,7 @@ il_led_blink_set(struct led_classdev *le
  
  	return il_led_cmd(il, *delay_on, *delay_off);
  }
@@ -16,7 +16,7 @@
  
  void
  il_leds_init(struct il_priv *il)
-@@ -562,7 +564,9 @@ il_leds_init(struct il_priv *il)
+@@ -561,7 +563,9 @@ il_leds_init(struct il_priv *il)
  	il->led.name =
  	    kasprintf(GFP_KERNEL, "%s-led", wiphy_name(il->hw->wiphy));
  	il->led.brightness_set = il_led_brightness_set;
diff --git a/patches/40-netdev-hw-features.patch b/patches/40-netdev-hw-features.patch
index a00780d8..36cf6b74 100644
--- a/patches/40-netdev-hw-features.patch
+++ b/patches/40-netdev-hw-features.patch
@@ -44,7 +44,7 @@ Date:   Thu Apr 7 07:32:18 2011 +0000
  void atl1c_set_ethtool_ops(struct net_device *netdev)
 --- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
 +++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
-@@ -487,6 +487,7 @@ static void atl1c_set_rxbufsize(struct a
+@@ -488,6 +488,7 @@ static void atl1c_set_rxbufsize(struct a
  		roundup(mtu + ETH_HLEN + ETH_FCS_LEN + VLAN_HLEN, 8) : AT_RX_BUF_SIZE;
  }
  
@@ -52,7 +52,7 @@ Date:   Thu Apr 7 07:32:18 2011 +0000
  static netdev_features_t atl1c_fix_features(struct net_device *netdev,
  	netdev_features_t features)
  {
-@@ -515,6 +516,7 @@ static int atl1c_set_features(struct net
+@@ -516,6 +517,7 @@ static int atl1c_set_features(struct net
  
  	return 0;
  }
@@ -60,7 +60,7 @@ Date:   Thu Apr 7 07:32:18 2011 +0000
  
  /*
   * atl1c_change_mtu - Change the Maximum Transfer Unit
-@@ -542,8 +544,19 @@ static int atl1c_change_mtu(struct net_d
+@@ -543,8 +545,19 @@ static int atl1c_change_mtu(struct net_d
  		netdev->mtu = new_mtu;
  		adapter->hw.max_frame_size = new_mtu;
  		atl1c_set_rxbufsize(adapter, netdev);
@@ -80,7 +80,7 @@ Date:   Thu Apr 7 07:32:18 2011 +0000
  		atl1c_up(adapter);
  		clear_bit(__AT_RESETTING, &adapter->flags);
  		if (adapter->hw.ctrl_flags & ATL1C_FPGA_VERSION) {
-@@ -2608,8 +2621,10 @@ static const struct net_device_ops atl1c
+@@ -2605,8 +2618,10 @@ static const struct net_device_ops atl1c
  	.ndo_set_mac_address	= atl1c_set_mac_addr,
  	.ndo_set_rx_mode	= atl1c_set_multi,
  	.ndo_change_mtu		= atl1c_change_mtu,
@@ -91,7 +91,7 @@ Date:   Thu Apr 7 07:32:18 2011 +0000
  	.ndo_do_ioctl		= atl1c_ioctl,
  	.ndo_tx_timeout		= atl1c_tx_timeout,
  	.ndo_get_stats		= atl1c_get_stats,
-@@ -2629,6 +2644,7 @@ static int atl1c_init_netdev(struct net_
+@@ -2626,6 +2641,7 @@ static int atl1c_init_netdev(struct net_
  	atl1c_set_ethtool_ops(netdev);
  
  	/* TODO: add when ready */
@@ -99,7 +99,7 @@ Date:   Thu Apr 7 07:32:18 2011 +0000
  	netdev->hw_features =	NETIF_F_SG	   |
  				NETIF_F_HW_CSUM	   |
  				NETIF_F_HW_VLAN_RX |
-@@ -2636,6 +2652,14 @@ static int atl1c_init_netdev(struct net_
+@@ -2633,6 +2649,14 @@ static int atl1c_init_netdev(struct net_
  				NETIF_F_TSO6;
  	netdev->features =	netdev->hw_features |
  				NETIF_F_HW_VLAN_TX;
@@ -187,7 +187,7 @@ Date:   Thu Apr 7 07:32:18 2011 +0000
  }
 --- a/drivers/net/ethernet/atheros/atlx/atl1.c
 +++ b/drivers/net/ethernet/atheros/atlx/atl1.c
-@@ -2873,8 +2873,10 @@ static const struct net_device_ops atl1_
+@@ -2876,8 +2876,10 @@ static const struct net_device_ops atl1_
  	.ndo_validate_addr	= eth_validate_addr,
  	.ndo_set_mac_address	= atl1_set_mac,
  	.ndo_change_mtu		= atl1_change_mtu,
@@ -198,7 +198,7 @@ Date:   Thu Apr 7 07:32:18 2011 +0000
  	.ndo_do_ioctl		= atlx_ioctl,
  	.ndo_tx_timeout		= atlx_tx_timeout,
  #ifdef CONFIG_NET_POLL_CONTROLLER
-@@ -2984,11 +2986,13 @@ static int __devinit atl1_probe(struct p
+@@ -2987,11 +2989,13 @@ static int __devinit atl1_probe(struct p
  	netdev->features |= NETIF_F_SG;
  	netdev->features |= (NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX);
  
@@ -212,7 +212,7 @@ Date:   Thu Apr 7 07:32:18 2011 +0000
  
  	/*
  	 * patch for some L1 of old version,
-@@ -3600,6 +3604,14 @@ static int atl1_set_pauseparam(struct ne
+@@ -3606,6 +3610,14 @@ static int atl1_set_pauseparam(struct ne
  	return 0;
  }
  
@@ -227,7 +227,7 @@ Date:   Thu Apr 7 07:32:18 2011 +0000
  static void atl1_get_strings(struct net_device *netdev, u32 stringset,
  	u8 *data)
  {
-@@ -3672,4 +3684,10 @@ static const struct ethtool_ops atl1_eth
+@@ -3678,4 +3690,10 @@ static const struct ethtool_ops atl1_eth
  	.nway_reset		= atl1_nway_reset,
  	.get_ethtool_stats	= atl1_get_ethtool_stats,
  	.get_sset_count		= atl1_get_sset_count,
@@ -311,7 +311,7 @@ Date:   Thu Apr 7 07:32:18 2011 +0000
  static void atl2_set_ethtool_ops(struct net_device *netdev)
 --- a/drivers/net/ethernet/atheros/atlx/atlx.c
 +++ b/drivers/net/ethernet/atheros/atlx/atlx.c
-@@ -247,6 +247,7 @@ static void atlx_restore_vlan(struct atl
+@@ -248,6 +248,7 @@ static void atlx_restore_vlan(struct atl
  	atlx_vlan_mode(adapter->netdev, adapter->netdev->features);
  }
  
@@ -319,7 +319,7 @@ Date:   Thu Apr 7 07:32:18 2011 +0000
  static netdev_features_t atlx_fix_features(struct net_device *netdev,
  	netdev_features_t features)
  {
-@@ -272,5 +273,6 @@ static int atlx_set_features(struct net_
+@@ -273,5 +274,6 @@ static int atlx_set_features(struct net_
  
  	return 0;
  }
diff --git a/patches/42-netlink_seq.patch b/patches/42-netlink_seq.patch
index ccc470cc..31a586dc 100644
--- a/patches/42-netlink_seq.patch
+++ b/patches/42-netlink_seq.patch
@@ -1,6 +1,6 @@
 --- a/net/wireless/nl80211.c
 +++ b/net/wireless/nl80211.c
-@@ -4175,7 +4175,9 @@ static int nl80211_dump_scan(struct sk_b
+@@ -4204,7 +4204,9 @@ static int nl80211_dump_scan(struct sk_b
  	spin_lock_bh(&rdev->bss_lock);
  	cfg80211_bss_expire(rdev);
  
diff --git a/patches/45-remove-platform-id-table.patch b/patches/45-remove-platform-id-table.patch
index 70110b64..86b8d6d5 100644
--- a/patches/45-remove-platform-id-table.patch
+++ b/patches/45-remove-platform-id-table.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/wl12xx/main.c
 +++ b/drivers/net/wireless/wl12xx/main.c
-@@ -5319,16 +5319,20 @@ static int __devexit wl12xx_remove(struc
+@@ -5577,16 +5577,20 @@ static int __devexit wl12xx_remove(struc
  	return 0;
  }
  
diff --git a/patches/46-use_other_workqueue.patch b/patches/46-use_other_workqueue.patch
index 63a93241..edfe2087 100644
--- a/patches/46-use_other_workqueue.patch
+++ b/patches/46-use_other_workqueue.patch
@@ -4,7 +4,7 @@ position before.
 
 --- a/net/bluetooth/hci_core.c
 +++ b/net/bluetooth/hci_core.c
-@@ -1531,8 +1531,12 @@ int hci_register_dev(struct hci_dev *hde
+@@ -1780,8 +1780,12 @@ int hci_register_dev(struct hci_dev *hde
  
  	write_unlock(&hci_dev_list_lock);