compat-wireless: refresh patches

Synchs with next-20120306

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

17 files changed, 42 insertions, 42 deletions

diff --git a/patches/01-netdev.patch b/patches/01-netdev.patch
index 9b4e7f1c..e82f656a 100644
--- a/patches/01-netdev.patch
+++ b/patches/01-netdev.patch
@@ -45,7 +45,7 @@ without creating a headache on maintenance of the pathes.
  
 --- a/drivers/net/wireless/rndis_wlan.c
 +++ b/drivers/net/wireless/rndis_wlan.c
-@@ -3456,7 +3456,7 @@ static int rndis_wlan_bind(struct usbnet
+@@ -3463,7 +3463,7 @@ static int rndis_wlan_bind(struct usbnet
  	 * rndis_host wants to avoid all OID as much as possible
  	 * so do promisc/multicast handling in rndis_wlan.
  	 */
@@ -56,7 +56,7 @@ without creating a headache on maintenance of the pathes.
  	retval = rndis_set_oid(usbdev, OID_GEN_CURRENT_PACKET_FILTER, &tmp,
 --- a/net/mac80211/iface.c
 +++ b/net/mac80211/iface.c
-@@ -701,7 +701,12 @@ static void ieee80211_if_setup(struct ne
+@@ -703,7 +703,12 @@ static void ieee80211_if_setup(struct ne
  {
  	ether_setup(dev);
  	dev->priv_flags &= ~IFF_TX_SKB_SHARING;
@@ -70,7 +70,7 @@ without creating a headache on maintenance of the pathes.
  	dev->destructor = free_netdev;
  }
  
-@@ -848,7 +853,7 @@ static void ieee80211_setup_sdata(struct
+@@ -850,7 +855,7 @@ static void ieee80211_setup_sdata(struct
  	/* and set some type-dependent values */
  	sdata->vif.type = type;
  	sdata->vif.p2p = false;
@@ -79,7 +79,7 @@ without creating a headache on maintenance of the pathes.
  	sdata->wdev.iftype = type;
  
  	sdata->control_port_protocol = cpu_to_be16(ETH_P_PAE);
-@@ -889,7 +894,7 @@ static void ieee80211_setup_sdata(struct
+@@ -891,7 +896,7 @@ static void ieee80211_setup_sdata(struct
  		break;
  	case NL80211_IFTYPE_MONITOR:
  		sdata->dev->type = ARPHRD_IEEE80211_RADIOTAP;
@@ -88,7 +88,7 @@ without creating a headache on maintenance of the pathes.
  		sdata->u.mntr_flags = MONITOR_FLAG_CONTROL |
  				      MONITOR_FLAG_OTHER_BSS;
  		break;
-@@ -1140,6 +1145,8 @@ int ieee80211_if_add(struct ieee80211_lo
+@@ -1142,6 +1147,8 @@ int ieee80211_if_add(struct ieee80211_lo
  		return -ENOMEM;
  	dev_net_set(ndev, wiphy_net(local->hw.wiphy));
  
@@ -97,7 +97,7 @@ without creating a headache on maintenance of the pathes.
  	ndev->needed_headroom = local->tx_headroom +
  				4*6 /* four MAC addresses */
  				+ 2 + 2 + 2 + 2 /* ctl, dur, seq, qos */
-@@ -1148,6 +1155,7 @@ int ieee80211_if_add(struct ieee80211_lo
+@@ -1150,6 +1157,7 @@ int ieee80211_if_add(struct ieee80211_lo
  				- ETH_HLEN /* ethernet hard_header_len */
  				+ IEEE80211_ENCRYPT_HEADROOM;
  	ndev->needed_tailroom = IEEE80211_ENCRYPT_TAILROOM;
@@ -186,7 +186,7 @@ without creating a headache on maintenance of the pathes.
  
 --- a/drivers/net/wireless/ipw2x00/ipw2100.c
 +++ b/drivers/net/wireless/ipw2x00/ipw2100.c
-@@ -6112,7 +6112,7 @@ static struct net_device *ipw2100_alloc_
+@@ -6105,7 +6105,7 @@ static struct net_device *ipw2100_alloc_
  	priv->ieee->perfect_rssi = -20;
  	priv->ieee->worst_rssi = -85;
  
diff --git a/patches/04-netns.patch b/patches/04-netns.patch
index e8308fba..a95d9ae9 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
-@@ -5194,7 +5194,9 @@ static int nl80211_wiphy_netns(struct sk
+@@ -5207,7 +5207,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/06-header-changes.patch b/patches/06-header-changes.patch
index 15355d56..3fdb2ff3 100644
--- a/patches/06-header-changes.patch
+++ b/patches/06-header-changes.patch
@@ -52,7 +52,7 @@ cases.
  
 --- a/net/mac80211/key.c
 +++ b/net/mac80211/key.c
-@@ -23,6 +23,9 @@
+@@ -24,6 +24,9 @@
  #include "aes_ccm.h"
  #include "aes_cmac.h"
  
diff --git a/patches/08-rename-config-options.patch b/patches/08-rename-config-options.patch
index d67a9b9b..0e96827d 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
-@@ -1375,7 +1375,7 @@ struct il_priv {
+@@ -1352,7 +1352,7 @@ struct il_priv {
  
  		} _3945;
  #endif
diff --git a/patches/09-threaded-irq.patch b/patches/09-threaded-irq.patch
index 69f02739..d09b5148 100644
--- a/patches/09-threaded-irq.patch
+++ b/patches/09-threaded-irq.patch
@@ -6,7 +6,7 @@ thread in process context as well.
 
 --- a/drivers/net/wireless/b43/main.c
 +++ b/drivers/net/wireless/b43/main.c
-@@ -4178,8 +4178,13 @@ redo:
+@@ -4180,8 +4180,13 @@ redo:
  	if (b43_bus_host_is_sdio(dev->dev)) {
  		b43_sdio_free_irq(dev);
  	} else {
@@ -20,7 +20,7 @@ thread in process context as well.
  	}
  	mutex_lock(&wl->mutex);
  	dev = wl->current_dev;
-@@ -4221,9 +4226,17 @@ static int b43_wireless_core_start(struc
+@@ -4223,9 +4228,17 @@ static int b43_wireless_core_start(struc
  			goto out;
  		}
  	} else {
@@ -38,7 +38,7 @@ thread in process context as well.
  		if (err) {
  			b43err(dev->wl, "Cannot request IRQ-%d\n",
  			       dev->dev->irq);
-@@ -5011,6 +5024,10 @@ static int b43_setup_bands(struct b43_wl
+@@ -5013,6 +5026,10 @@ static int b43_setup_bands(struct b43_wl
  
  static void b43_wireless_core_detach(struct b43_wldev *dev)
  {
diff --git a/patches/11-dev-pm-ops.patch b/patches/11-dev-pm-ops.patch
index 619cd00f..c43d94db 100644
--- a/patches/11-dev-pm-ops.patch
+++ b/patches/11-dev-pm-ops.patch
@@ -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
-@@ -6760,7 +6760,12 @@ static struct pci_driver il4965_driver =
+@@ -6759,7 +6759,12 @@ static struct pci_driver il4965_driver =
  	.id_table = il4965_hw_card_ids,
  	.probe = il4965_pci_probe,
  	.remove = __devexit_p(il4965_pci_remove),
@@ -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
-@@ -1870,7 +1870,12 @@ __le32 il_add_beacon_time(struct il_priv
+@@ -1847,7 +1847,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);
@@ -217,7 +217,7 @@ calls on compat code with only slight modifications.
  
 --- a/drivers/net/wireless/iwlwifi/iwl-pci.c
 +++ b/drivers/net/wireless/iwlwifi/iwl-pci.c
-@@ -367,6 +367,9 @@ static int iwl_pci_resume(struct device
+@@ -361,6 +361,9 @@ static int iwl_pci_resume(struct device
  
  static SIMPLE_DEV_PM_OPS(iwl_dev_pm_ops, iwl_pci_suspend, iwl_pci_resume);
  
@@ -227,7 +227,7 @@ calls on compat code with only slight modifications.
  #define IWL_PM_OPS	(&iwl_dev_pm_ops)
  
  #else
-@@ -380,7 +383,12 @@ static struct pci_driver iwl_pci_driver
+@@ -374,7 +377,12 @@ static struct pci_driver iwl_pci_driver
  	.id_table = iwl_hw_card_ids,
  	.probe = iwl_pci_probe,
  	.remove = __devexit_p(iwl_pci_remove),
diff --git a/patches/12-iw_handler-changes.patch b/patches/12-iw_handler-changes.patch
index 1b9154bf..2da83820 100644
--- a/patches/12-iw_handler-changes.patch
+++ b/patches/12-iw_handler-changes.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ipw2x00/ipw2100.c
 +++ b/drivers/net/wireless/ipw2x00/ipw2100.c
-@@ -6115,7 +6115,11 @@ static struct net_device *ipw2100_alloc_
+@@ -6108,7 +6108,11 @@ static struct net_device *ipw2100_alloc_
  	netdev_attach_ops(dev, &ipw2100_netdev_ops);
  	dev->ethtool_ops = &ipw2100_ethtool_ops;
  	dev->wireless_handlers = &ipw2100_wx_handler_def;
diff --git a/patches/12-mac80211-disable-tx-status.patch b/patches/12-mac80211-disable-tx-status.patch
index 2de1996a..6ee16bd9 100644
--- a/patches/12-mac80211-disable-tx-status.patch
+++ b/patches/12-mac80211-disable-tx-status.patch
@@ -6,7 +6,7 @@ So we need to just ifdef this part out.
 
 --- a/net/mac80211/tx.c
 +++ b/net/mac80211/tx.c
-@@ -1944,6 +1944,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s
+@@ -1949,6 +1949,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s
  		goto fail;
  	}
  
@@ -14,7 +14,7 @@ So we need to just ifdef this part out.
  	if (unlikely(!multicast && skb->sk &&
  		     skb_shinfo(skb)->tx_flags & SKBTX_WIFI_STATUS)) {
  		struct sk_buff *orig_skb = skb;
-@@ -1982,6 +1983,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s
+@@ -1987,6 +1988,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s
  			skb = orig_skb;
  		}
  	}
diff --git a/patches/15-symbol-export-conflicts.patch b/patches/15-symbol-export-conflicts.patch
index b4d871b1..4f5a01b6 100644
--- a/patches/15-symbol-export-conflicts.patch
+++ b/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
 +++ b/net/mac80211/rx.c
-@@ -3117,7 +3117,12 @@ void ieee80211_rx(struct ieee80211_hw *h
+@@ -3103,7 +3103,12 @@ void ieee80211_rx(struct ieee80211_hw *h
   drop:
  	kfree_skb(skb);
  }
diff --git a/patches/16-bluetooth.patch b/patches/16-bluetooth.patch
index 3a218c43..c0bbc989 100644
--- a/patches/16-bluetooth.patch
+++ b/patches/16-bluetooth.patch
@@ -3,7 +3,7 @@ here still, but for now we keep this here.
 
 --- a/drivers/bluetooth/hci_ldisc.c
 +++ b/drivers/bluetooth/hci_ldisc.c
-@@ -273,8 +273,13 @@ static int hci_uart_tty_open(struct tty_
+@@ -271,8 +271,13 @@ static int hci_uart_tty_open(struct tty_
  	/* FIXME: why is this needed. Note don't use ldisc_ref here as the
  	   open path is before the ldisc is referencable */
  
@@ -17,7 +17,7 @@ here still, but for now we keep this here.
  	tty_driver_flush_buffer(tty);
  
  	return 0;
-@@ -390,7 +395,9 @@ static int hci_uart_register_dev(struct
+@@ -388,7 +393,9 @@ static int hci_uart_register_dev(struct
  	hdev->close = hci_uart_close;
  	hdev->flush = hci_uart_flush;
  	hdev->send  = hci_uart_send_frame;
@@ -25,9 +25,9 @@ here still, but for now we keep this here.
  	hdev->parent = hu->tty->dev;
 +#endif
  
- 	if (!reset)
- 		set_bit(HCI_QUIRK_NO_RESET, &hdev->quirks);
-@@ -488,7 +495,11 @@ static int hci_uart_tty_ioctl(struct tty
+ 	if (test_bit(HCI_UART_RAW_DEVICE, &hu->hdev_flags))
+ 		set_bit(HCI_QUIRK_RAW_DEVICE, &hdev->quirks);
+@@ -491,7 +498,11 @@ static int hci_uart_tty_ioctl(struct tty
  		return hu->hdev_flags;
  
  	default:
@@ -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
-@@ -891,7 +891,11 @@ drop:
+@@ -893,7 +893,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;
-@@ -1063,8 +1067,12 @@ static struct proto hci_sk_proto = {
+@@ -1065,8 +1069,12 @@ static struct proto hci_sk_proto = {
  	.obj_size	= sizeof(struct hci_pinfo)
  };
  
@@ -590,7 +590,7 @@ here still, but for now we keep this here.
  
 --- a/net/bluetooth/l2cap_sock.c
 +++ b/net/bluetooth/l2cap_sock.c
-@@ -528,7 +528,14 @@ static int l2cap_sock_setsockopt_old(str
+@@ -530,7 +530,14 @@ static int l2cap_sock_setsockopt_old(str
  	return err;
  }
  
@@ -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;
-@@ -1043,8 +1050,12 @@ static struct sock *l2cap_sock_alloc(str
+@@ -1057,8 +1064,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;
  
-@@ -1056,7 +1067,11 @@ static int l2cap_sock_create(struct net
+@@ -1070,7 +1081,11 @@ static int l2cap_sock_create(struct net
  			sock->type != SOCK_DGRAM && sock->type != SOCK_RAW)
  		return -ESOCKTNOSUPPORT;
  
diff --git a/patches/17-netdev-queue.patch b/patches/17-netdev-queue.patch
index 65546855..73e875f8 100644
--- a/patches/17-netdev-queue.patch
+++ b/patches/17-netdev-queue.patch
@@ -14,7 +14,7 @@ The patch that introduced this on mac80211 was:
 
 --- a/net/mac80211/iface.c
 +++ b/net/mac80211/iface.c
-@@ -1244,6 +1244,7 @@ void ieee80211_if_remove(struct ieee8021
+@@ -1246,6 +1246,7 @@ void ieee80211_if_remove(struct ieee8021
   * Remove all interfaces, may only be called at hardware unregistration
   * time because it doesn't do RCU-safe list removals.
   */
@@ -22,7 +22,7 @@ The patch that introduced this on mac80211 was:
  void ieee80211_remove_interfaces(struct ieee80211_local *local)
  {
  	struct ieee80211_sub_if_data *sdata, *tmp;
-@@ -1264,6 +1265,22 @@ void ieee80211_remove_interfaces(struct
+@@ -1266,6 +1267,22 @@ void ieee80211_remove_interfaces(struct
  	unregister_netdevice_many(&unreg_list);
  	list_del(&unreg_list);
  }
diff --git a/patches/22-multiqueue.patch b/patches/22-multiqueue.patch
index 0860f9e6..bf12c4b8 100644
--- a/patches/22-multiqueue.patch
+++ b/patches/22-multiqueue.patch
@@ -96,7 +96,7 @@ queue by using skb_set_queue_mapping(skb, 0) through ieee80211_tx_skb()
  
 --- a/net/mac80211/tx.c
 +++ b/net/mac80211/tx.c
-@@ -1464,6 +1464,10 @@ void ieee80211_xmit(struct ieee80211_sub
+@@ -1469,6 +1469,10 @@ void ieee80211_xmit(struct ieee80211_sub
  				return;
  			}
  
@@ -107,7 +107,7 @@ queue by using skb_set_queue_mapping(skb, 0) through ieee80211_tx_skb()
  	ieee80211_set_qos_hdr(sdata, skb);
  	ieee80211_tx(sdata, skb, false);
  	rcu_read_unlock();
-@@ -2199,7 +2203,14 @@ void ieee80211_tx_pending(unsigned long
+@@ -2204,7 +2208,14 @@ void ieee80211_tx_pending(unsigned long
  
  		if (skb_queue_empty(&local->pending[i]))
  			list_for_each_entry_rcu(sdata, &local->interfaces, list)
diff --git a/patches/25-multicast-list_head.patch b/patches/25-multicast-list_head.patch
index 21c1657d..c84d413d 100644
--- a/patches/25-multicast-list_head.patch
+++ b/patches/25-multicast-list_head.patch
@@ -480,7 +480,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
  	return 1; /* update */
 --- a/drivers/net/wireless/rndis_wlan.c
 +++ b/drivers/net/wireless/rndis_wlan.c
-@@ -1659,7 +1659,11 @@ static void set_multicast_list(struct us
+@@ -1661,7 +1661,11 @@ static void set_multicast_list(struct us
  
  		netdev_for_each_mc_addr(ha, usbdev->net)
  			memcpy(mc_addrs + i++ * ETH_ALEN,
@@ -600,7 +600,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
  	return (u64)(unsigned long)fp;
 --- a/drivers/net/wireless/zd1211rw/zd_mac.c
 +++ b/drivers/net/wireless/zd1211rw/zd_mac.c
-@@ -1203,17 +1203,34 @@ static void zd_process_intr(struct work_
+@@ -1213,17 +1213,34 @@ static void zd_process_intr(struct work_
  
  
  static u64 zd_op_prepare_multicast(struct ieee80211_hw *hw,
@@ -651,7 +651,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
  	}
 --- a/include/net/mac80211.h
 +++ b/include/net/mac80211.h
-@@ -2182,7 +2182,11 @@ struct ieee80211_ops {
+@@ -2189,7 +2189,11 @@ struct ieee80211_ops {
  			       enum ieee80211_tx_sync_type type);
  
  	u64 (*prepare_multicast)(struct ieee80211_hw *hw,
diff --git a/patches/30-bridge-port.patch b/patches/30-bridge-port.patch
index 949f3195..601f77f5 100644
--- a/patches/30-bridge-port.patch
+++ b/patches/30-bridge-port.patch
@@ -34,7 +34,7 @@ compat-wireless.
  	     ntype == NL80211_IFTYPE_P2P_CLIENT))
 --- a/net/wireless/nl80211.c
 +++ b/net/wireless/nl80211.c
-@@ -1597,7 +1597,7 @@ static int nl80211_valid_4addr(struct cf
+@@ -1598,7 +1598,7 @@ static int nl80211_valid_4addr(struct cf
  			       enum nl80211_iftype iftype)
  {
  	if (!use_4addr) {
diff --git a/patches/42-netlink_seq.patch b/patches/42-netlink_seq.patch
index 31a586dc..03b76ab5 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
-@@ -4204,7 +4204,9 @@ static int nl80211_dump_scan(struct sk_b
+@@ -4217,7 +4217,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 edfe2087..7119ac44 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
-@@ -1780,8 +1780,12 @@ int hci_register_dev(struct hci_dev *hde
+@@ -1809,8 +1809,12 @@ int hci_register_dev(struct hci_dev *hde
  
  	write_unlock(&hci_dev_list_lock);
  
diff --git a/patches/48-use_skb_get_queue_mapping.patch b/patches/48-use_skb_get_queue_mapping.patch
index e3735641..eab1d6d0 100644
--- a/patches/48-use_skb_get_queue_mapping.patch
+++ b/patches/48-use_skb_get_queue_mapping.patch
@@ -4,7 +4,7 @@ function always returns something.
 
 --- a/drivers/net/wireless/b43/main.c
 +++ b/drivers/net/wireless/b43/main.c
-@@ -3405,11 +3405,11 @@ static void b43_op_tx(struct ieee80211_h
+@@ -3407,11 +3407,11 @@ static void b43_op_tx(struct ieee80211_h
  	}
  	B43_WARN_ON(skb_shinfo(skb)->nr_frags);