From 14d0e0462a2dc22df51a3a8f4509b2539a20b9f1 Mon Sep 17 00:00:00 2001
From: "Luis R. Rodriguez" <mcgrof@frijolero.org>
Date: Mon, 2 Apr 2012 14:15:43 -0700
Subject: [PATCH] compat-wireless: refresh patches for next-20120402

Signed-off-by: Luis R. Rodriguez <mcgrof@frijolero.org>
---
 patches/01-netdev.patch                |  4 +-
 patches/04-netns.patch                 |  2 +-
 patches/09-cfg80211-wext-padding.patch |  2 +-
 patches/11-dev-pm-ops.patch            |  6 +--
 patches/14-device-type.patch           |  2 +-
 patches/16-bluetooth.patch             | 20 ++++-----
 patches/24-pcmcia.patch                | 62 +++++++++++++-------------
 patches/25-multicast-list_head.patch   |  2 +-
 patches/36-workqueue.patch             |  2 +-
 patches/42-netlink_seq.patch           |  2 +-
 patches/46-use_other_workqueue.patch   |  2 +-
 11 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/patches/01-netdev.patch b/patches/01-netdev.patch
index c5ec7b9b44cb..ca5b09bc5eea 100644
--- a/patches/01-netdev.patch
+++ b/patches/01-netdev.patch
@@ -23,7 +23,7 @@ without creating a headache on maintenance of the pathes.
  	if (unlikely(retval < 0)) {
 --- a/drivers/net/usb/usbnet.c
 +++ b/drivers/net/usb/usbnet.c
-@@ -1377,7 +1377,7 @@ usbnet_probe (struct usb_interface *udev
+@@ -1386,7 +1386,7 @@ usbnet_probe (struct usb_interface *udev
  		net->features |= NETIF_F_HIGHDMA;
  #endif
  
@@ -289,7 +289,7 @@ without creating a headache on maintenance of the pathes.
  	priv->media_connected = false;
 --- a/drivers/net/wireless/orinoco/main.c
 +++ b/drivers/net/wireless/orinoco/main.c
-@@ -2270,14 +2270,18 @@ int orinoco_if_add(struct orinoco_privat
+@@ -2278,14 +2278,18 @@ int orinoco_if_add(struct orinoco_privat
  #endif
  	/* Default to standard ops if not set */
  	if (ops)
diff --git a/patches/04-netns.patch b/patches/04-netns.patch
index 24030df70caf..7e89d7fdbb7b 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
-@@ -5215,7 +5215,9 @@ static int nl80211_wiphy_netns(struct sk
+@@ -5223,7 +5223,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/09-cfg80211-wext-padding.patch b/patches/09-cfg80211-wext-padding.patch
index cbba23797e9c..90a3342aa8e2 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
-@@ -2012,6 +2012,9 @@ struct wiphy_wowlan_support {
+@@ -2014,6 +2014,9 @@ struct wiphy_wowlan_support {
  struct wiphy {
  	/* assign these fields before you register the wiphy */
  
diff --git a/patches/11-dev-pm-ops.patch b/patches/11-dev-pm-ops.patch
index c550066d34ea..48fc5273b3da 100644
--- a/patches/11-dev-pm-ops.patch
+++ b/patches/11-dev-pm-ops.patch
@@ -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
-@@ -3883,7 +3883,12 @@ static struct pci_driver il3945_driver =
+@@ -3881,7 +3881,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
-@@ -6759,7 +6759,12 @@ static struct pci_driver il4965_driver =
+@@ -6758,7 +6758,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
-@@ -4900,15 +4900,17 @@ il_pci_resume(struct device *device)
+@@ -4909,15 +4909,17 @@ il_pci_resume(struct device *device)
  }
  EXPORT_SYMBOL(il_pci_resume);
  
diff --git a/patches/14-device-type.patch b/patches/14-device-type.patch
index 52b9cd7f8577..8517a2737b0d 100644
--- a/patches/14-device-type.patch
+++ b/patches/14-device-type.patch
@@ -36,7 +36,7 @@ compile warning.
  {
 --- a/drivers/net/usb/usbnet.c
 +++ b/drivers/net/usb/usbnet.c
-@@ -1292,13 +1292,17 @@ static const struct net_device_ops usbne
+@@ -1301,13 +1301,17 @@ static const struct net_device_ops usbne
  
  // precondition: never called in_interrupt
  
diff --git a/patches/16-bluetooth.patch b/patches/16-bluetooth.patch
index 113e08144bcf..649799954c16 100644
--- a/patches/16-bluetooth.patch
+++ b/patches/16-bluetooth.patch
@@ -84,7 +84,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
-@@ -892,7 +892,11 @@ drop:
+@@ -891,7 +891,11 @@ drop:
  	goto done;
  }
  
@@ -96,7 +96,7 @@ here still, but for now we keep this here.
  {
  	struct hci_ufilter uf = { .opcode = 0 };
  	struct sock *sk = sock->sk;
-@@ -1064,8 +1068,12 @@ static struct proto hci_sk_proto = {
+@@ -1063,8 +1067,12 @@ static struct proto hci_sk_proto = {
  	.obj_size	= sizeof(struct hci_pinfo)
  };
  
@@ -417,7 +417,7 @@ here still, but for now we keep this here.
  module_init(hidp_init);
 --- a/net/bluetooth/rfcomm/sock.c
 +++ b/net/bluetooth/rfcomm/sock.c
-@@ -325,8 +325,13 @@ static struct sock *rfcomm_sock_alloc(st
+@@ -324,8 +324,13 @@ static struct sock *rfcomm_sock_alloc(st
  	return sk;
  }
  
@@ -431,7 +431,7 @@ here still, but for now we keep this here.
  {
  	struct sock *sk;
  
-@@ -680,7 +685,11 @@ static int rfcomm_sock_setsockopt_old(st
+@@ -679,7 +684,11 @@ static int rfcomm_sock_setsockopt_old(st
  	return err;
  }
  
@@ -508,7 +508,7 @@ here still, but for now we keep this here.
  	struct rfcomm_dlc *dlc = dev->dlc;
 --- a/net/bluetooth/sco.c
 +++ b/net/bluetooth/sco.c
-@@ -441,8 +441,12 @@ static struct sock *sco_sock_alloc(struc
+@@ -440,8 +440,12 @@ static struct sock *sco_sock_alloc(struc
  	return sk;
  }
  
@@ -521,7 +521,7 @@ here still, but for now we keep this here.
  {
  	struct sock *sk;
  
-@@ -658,7 +662,11 @@ static int sco_sock_sendmsg(struct kiocb
+@@ -657,7 +661,11 @@ static int sco_sock_sendmsg(struct kiocb
  	return err;
  }
  
@@ -535,7 +535,7 @@ here still, but for now we keep this here.
  	int err = 0;
 --- a/net/bluetooth/bnep/sock.c
 +++ b/net/bluetooth/bnep/sock.c
-@@ -196,8 +196,12 @@ static struct proto bnep_proto = {
+@@ -195,8 +195,12 @@ static struct proto bnep_proto = {
  	.obj_size	= sizeof(struct bt_sock)
  };
  
@@ -550,7 +550,7 @@ here still, but for now we keep this here.
  
 --- a/net/bluetooth/cmtp/sock.c
 +++ b/net/bluetooth/cmtp/sock.c
-@@ -190,8 +190,12 @@ static struct proto cmtp_proto = {
+@@ -189,8 +189,12 @@ static struct proto cmtp_proto = {
  	.obj_size	= sizeof(struct bt_sock)
  };
  
@@ -595,7 +595,7 @@ here still, but for now we keep this here.
  {
  	struct sock *sk = sock->sk;
  	struct l2cap_chan *chan = l2cap_pi(sk)->chan;
-@@ -1059,8 +1066,12 @@ static struct sock *l2cap_sock_alloc(str
+@@ -1060,8 +1067,12 @@ static struct sock *l2cap_sock_alloc(str
  	return sk;
  }
  
@@ -608,7 +608,7 @@ here still, but for now we keep this here.
  {
  	struct sock *sk;
  
-@@ -1072,7 +1083,11 @@ static int l2cap_sock_create(struct net
+@@ -1073,7 +1084,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 9e7990c5028c..5eb20c71fa1f 100644
--- a/patches/24-pcmcia.patch
+++ b/patches/24-pcmcia.patch
@@ -191,7 +191,7 @@
  	.id_table	= bluecard_ids,
 --- a/drivers/bluetooth/bt3c_cs.c
 +++ b/drivers/bluetooth/bt3c_cs.c
-@@ -187,7 +187,11 @@ static void bt3c_write_wakeup(bt3c_info_
+@@ -186,7 +186,11 @@ static void bt3c_write_wakeup(bt3c_info_
  		return;
  
  	do {
@@ -203,7 +203,7 @@
  		register struct sk_buff *skb;
  		register int len;
  
-@@ -225,7 +229,11 @@ static void bt3c_receive(bt3c_info_t *in
+@@ -224,7 +228,11 @@ static void bt3c_receive(bt3c_info_t *in
  		return;
  	}
  
@@ -215,7 +215,7 @@
  
  	avail = bt3c_read(iobase, 0x7006);
  	//printk("bt3c_cs: receiving %d bytes\n", avail);
-@@ -346,7 +354,11 @@ static irqreturn_t bt3c_interrupt(int ir
+@@ -345,7 +353,11 @@ static irqreturn_t bt3c_interrupt(int ir
  		/* our irq handler is shared */
  		return IRQ_NONE;
  
@@ -227,7 +227,7 @@
  
  	spin_lock(&(info->lock));
  
-@@ -474,7 +486,11 @@ static int bt3c_load_firmware(bt3c_info_
+@@ -473,7 +485,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);
-@@ -646,8 +662,27 @@ static int bt3c_probe(struct pcmcia_devi
+@@ -645,8 +661,27 @@ static int bt3c_probe(struct pcmcia_devi
  	info->p_dev = link;
  	link->priv = info;
  
@@ -267,7 +267,7 @@
  
  	return bt3c_config(link);
  }
-@@ -661,6 +696,7 @@ static void bt3c_detach(struct pcmcia_de
+@@ -660,6 +695,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;
-@@ -699,6 +735,63 @@ static int bt3c_check_config_notpicky(st
+@@ -698,6 +734,63 @@ static int bt3c_check_config_notpicky(st
  	}
  	return -ENODEV;
  }
@@ -339,7 +339,7 @@
  
  static int bt3c_config(struct pcmcia_device *link)
  {
-@@ -722,9 +815,15 @@ static int bt3c_config(struct pcmcia_dev
+@@ -721,9 +814,15 @@ static int bt3c_config(struct pcmcia_dev
  	goto failed;
  
  found_port:
@@ -355,7 +355,7 @@
  
  	i = pcmcia_enable_device(link);
  	if (i != 0)
-@@ -759,7 +858,13 @@ MODULE_DEVICE_TABLE(pcmcia, bt3c_ids);
+@@ -758,7 +857,13 @@ MODULE_DEVICE_TABLE(pcmcia, bt3c_ids);
  
  static struct pcmcia_driver bt3c_driver = {
  	.owner		= THIS_MODULE,
@@ -371,7 +371,7 @@
  	.id_table	= bt3c_ids,
 --- a/drivers/bluetooth/btuart_cs.c
 +++ b/drivers/bluetooth/btuart_cs.c
-@@ -141,7 +141,11 @@ static void btuart_write_wakeup(btuart_i
+@@ -140,7 +140,11 @@ static void btuart_write_wakeup(btuart_i
  	}
  
  	do {
@@ -383,7 +383,7 @@
  		register struct sk_buff *skb;
  		register int len;
  
-@@ -182,7 +186,11 @@ static void btuart_receive(btuart_info_t
+@@ -181,7 +185,11 @@ static void btuart_receive(btuart_info_t
  		return;
  	}
  
@@ -395,7 +395,7 @@
  
  	do {
  		info->hdev->stat.byte_rx++;
-@@ -296,7 +304,11 @@ static irqreturn_t btuart_interrupt(int
+@@ -295,7 +303,11 @@ static irqreturn_t btuart_interrupt(int
  		/* our irq handler is shared */
  		return IRQ_NONE;
  
@@ -407,7 +407,7 @@
  
  	spin_lock(&(info->lock));
  
-@@ -353,7 +365,11 @@ static void btuart_change_speed(btuart_i
+@@ -352,7 +364,11 @@ static void btuart_change_speed(btuart_i
  		return;
  	}
  
@@ -419,7 +419,7 @@
  
  	spin_lock_irqsave(&(info->lock), flags);
  
-@@ -472,7 +488,11 @@ static int btuart_hci_ioctl(struct hci_d
+@@ -471,7 +487,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));
-@@ -539,7 +559,11 @@ static int btuart_open(btuart_info_t *in
+@@ -538,7 +558,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)
-@@ -575,8 +599,27 @@ static int btuart_probe(struct pcmcia_de
+@@ -574,8 +598,27 @@ static int btuart_probe(struct pcmcia_de
  	info->p_dev = link;
  	link->priv = info;
  
@@ -471,7 +471,7 @@
  
  	return btuart_config(link);
  }
-@@ -590,6 +633,7 @@ static void btuart_detach(struct pcmcia_
+@@ -589,6 +632,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;
-@@ -628,6 +672,63 @@ static int btuart_check_config_notpicky(
+@@ -627,6 +671,63 @@ static int btuart_check_config_notpicky(
  	}
  	return -ENODEV;
  }
@@ -543,7 +543,7 @@
  
  static int btuart_config(struct pcmcia_device *link)
  {
-@@ -651,9 +752,15 @@ static int btuart_config(struct pcmcia_d
+@@ -650,9 +751,15 @@ static int btuart_config(struct pcmcia_d
  	goto failed;
  
  found_port:
@@ -559,7 +559,7 @@
  
  	i = pcmcia_enable_device(link);
  	if (i != 0)
-@@ -687,7 +794,13 @@ MODULE_DEVICE_TABLE(pcmcia, btuart_ids);
+@@ -686,7 +793,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
-@@ -145,7 +145,11 @@ static void dtl1_write_wakeup(dtl1_info_
+@@ -144,7 +144,11 @@ static void dtl1_write_wakeup(dtl1_info_
  	}
  
  	do {
@@ -587,7 +587,7 @@
  		register struct sk_buff *skb;
  		register int len;
  
-@@ -210,7 +214,11 @@ static void dtl1_receive(dtl1_info_t *in
+@@ -209,7 +213,11 @@ static void dtl1_receive(dtl1_info_t *in
  		return;
  	}
  
@@ -599,7 +599,7 @@
  
  	do {
  		info->hdev->stat.byte_rx++;
-@@ -297,7 +305,11 @@ static irqreturn_t dtl1_interrupt(int ir
+@@ -296,7 +304,11 @@ static irqreturn_t dtl1_interrupt(int ir
  		/* our irq handler is shared */
  		return IRQ_NONE;
  
@@ -611,7 +611,7 @@
  
  	spin_lock(&(info->lock));
  
-@@ -452,7 +464,11 @@ static int dtl1_hci_ioctl(struct hci_dev
+@@ -451,7 +463,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));
-@@ -496,8 +512,13 @@ static int dtl1_open(dtl1_info_t *info)
+@@ -495,8 +511,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);
-@@ -522,7 +543,11 @@ static int dtl1_open(dtl1_info_t *info)
+@@ -521,7 +542,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)
-@@ -558,7 +583,24 @@ static int dtl1_probe(struct pcmcia_devi
+@@ -557,7 +582,24 @@ static int dtl1_probe(struct pcmcia_devi
  	info->p_dev = link;
  	link->priv = info;
  
@@ -674,7 +674,7 @@
  
  	return dtl1_config(link);
  }
-@@ -573,6 +615,7 @@ static void dtl1_detach(struct pcmcia_de
+@@ -572,6 +614,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))
-@@ -583,6 +626,29 @@ static int dtl1_confcheck(struct pcmcia_
+@@ -582,6 +625,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)
  {
-@@ -590,13 +656,23 @@ static int dtl1_config(struct pcmcia_dev
+@@ -589,13 +655,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)
-@@ -623,7 +699,13 @@ MODULE_DEVICE_TABLE(pcmcia, dtl1_ids);
+@@ -622,7 +698,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 d8f1a8e9aed2..449475fd22a6 100644
--- a/patches/25-multicast-list_head.patch
+++ b/patches/25-multicast-list_head.patch
@@ -768,7 +768,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
  	spin_unlock_bh(&local->filter_lock);
  
  	/* be a bit nasty */
-@@ -598,9 +602,11 @@ struct ieee80211_hw *ieee80211_alloc_hw(
+@@ -595,9 +599,11 @@ struct ieee80211_hw *ieee80211_alloc_hw(
  	wiphy->ht_capa_mod_mask = &mac80211_ht_capa_mod_mask;
  
  	INIT_LIST_HEAD(&local->interfaces);
diff --git a/patches/36-workqueue.patch b/patches/36-workqueue.patch
index b8d510448aed..4bd436ac2593 100644
--- a/patches/36-workqueue.patch
+++ b/patches/36-workqueue.patch
@@ -3,7 +3,7 @@ The rest is backported in include/linux/compat-2.6.37.h
 
 --- a/net/mac80211/main.c
 +++ b/net/mac80211/main.c
-@@ -1100,6 +1100,10 @@ static void __exit ieee80211_exit(void)
+@@ -1097,6 +1097,10 @@ static void __exit ieee80211_exit(void)
  	rc80211_minstrel_ht_exit();
  	rc80211_minstrel_exit();
  
diff --git a/patches/42-netlink_seq.patch b/patches/42-netlink_seq.patch
index 7d6815ef7835..f43df8721774 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
-@@ -4218,7 +4218,9 @@ static int nl80211_dump_scan(struct sk_b
+@@ -4226,7 +4226,9 @@ static int nl80211_dump_scan(struct sk_b
  	spin_lock_bh(&rdev->bss_lock);
  	cfg80211_bss_expire(rdev);
  
diff --git a/patches/46-use_other_workqueue.patch b/patches/46-use_other_workqueue.patch
index d323fe9b3515..57d404dee385 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
-@@ -1827,8 +1827,12 @@ int hci_register_dev(struct hci_dev *hde
+@@ -1826,8 +1826,12 @@ int hci_register_dev(struct hci_dev *hde
  
  	write_unlock(&hci_dev_list_lock);
  
-- 
2.30.2