compat-wireless: refresh patches

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

15 files changed, 39 insertions, 39 deletions

diff --git a/patches/01-netdev.patch b/patches/01-netdev.patch
index f4704cda..c94bb863 100644
--- a/patches/01-netdev.patch
+++ b/patches/01-netdev.patch
@@ -34,7 +34,7 @@ without creating a headache on maintenance of the pathes.
  
 --- a/drivers/net/wireless/ath/ath6kl/main.c
 +++ b/drivers/net/wireless/ath/ath6kl/main.c
-@@ -1114,7 +1114,7 @@ static struct net_device_ops ath6kl_netd
+@@ -1029,7 +1029,7 @@ static struct net_device_ops ath6kl_netd
  
  void init_netdev(struct net_device *dev)
  {
@@ -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
-@@ -700,7 +700,12 @@ static void ieee80211_if_setup(struct ne
+@@ -701,7 +701,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;
  }
  
-@@ -847,7 +852,7 @@ static void ieee80211_setup_sdata(struct
+@@ -848,7 +853,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);
-@@ -888,7 +893,7 @@ static void ieee80211_setup_sdata(struct
+@@ -889,7 +894,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;
-@@ -1139,6 +1144,8 @@ int ieee80211_if_add(struct ieee80211_lo
+@@ -1140,6 +1145,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 */
-@@ -1147,6 +1154,7 @@ int ieee80211_if_add(struct ieee80211_lo
+@@ -1148,6 +1155,7 @@ int ieee80211_if_add(struct ieee80211_lo
  				- ETH_HLEN /* ethernet hard_header_len */
  				+ IEEE80211_ENCRYPT_HEADROOM;
  	ndev->needed_tailroom = IEEE80211_ENCRYPT_TAILROOM;
@@ -267,7 +267,7 @@ without creating a headache on maintenance of the pathes.
  #define LBS_DEB_LEAVE	0x00000002
 --- a/drivers/net/wireless/mac80211_hwsim.c
 +++ b/drivers/net/wireless/mac80211_hwsim.c
-@@ -1238,7 +1238,7 @@ static const struct net_device_ops hwsim
+@@ -1239,7 +1239,7 @@ static const struct net_device_ops hwsim
  
  static void hwsim_mon_setup(struct net_device *dev)
  {
diff --git a/patches/04-netns.patch b/patches/04-netns.patch
index c4909845..1bcc66bf 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
-@@ -5094,7 +5094,9 @@ static int nl80211_wiphy_netns(struct sk
+@@ -5134,7 +5134,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 24a21cb4..76b81748 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
-@@ -1978,6 +1978,9 @@ struct wiphy_wowlan_support {
+@@ -1990,6 +1990,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 0ac8ad2e..df979392 100644
--- a/patches/11-dev-pm-ops.patch
+++ b/patches/11-dev-pm-ops.patch
@@ -191,7 +191,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
-@@ -520,6 +520,9 @@ static int iwl_pci_resume(struct device
+@@ -528,6 +528,9 @@ static int iwl_pci_resume(struct device
  
  static SIMPLE_DEV_PM_OPS(iwl_dev_pm_ops, iwl_pci_suspend, iwl_pci_resume);
  
@@ -201,7 +201,7 @@ calls on compat code with only slight modifications.
  #define IWL_PM_OPS	(&iwl_dev_pm_ops)
  
  #else
-@@ -533,7 +536,12 @@ static struct pci_driver iwl_pci_driver
+@@ -541,7 +544,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-mac80211-disable-tx-status.patch b/patches/12-mac80211-disable-tx-status.patch
index 019057d7..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
-@@ -1953,6 +1953,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;
-@@ -1991,6 +1992,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 e7af13d9..eb5b5613 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
-@@ -3078,7 +3078,12 @@ void ieee80211_rx(struct ieee80211_hw *h
+@@ -3141,7 +3141,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 06bdf58a..c68a662c 100644
--- a/patches/16-bluetooth.patch
+++ b/patches/16-bluetooth.patch
@@ -66,7 +66,7 @@ here still, but for now we keep this here.
  		bt_sock_reclassify_lock(sock, proto);
  		module_put(bt_proto[proto]->owner);
  	}
-@@ -478,7 +486,11 @@ int bt_sock_ioctl(struct socket *sock, u
+@@ -475,7 +483,11 @@ int bt_sock_ioctl(struct socket *sock, u
  		if (sk->sk_state == BT_LISTEN)
  			return -EINVAL;
  
@@ -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
-@@ -561,7 +561,11 @@ drop:
+@@ -564,7 +564,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;
-@@ -716,8 +720,12 @@ static struct proto hci_sk_proto = {
+@@ -719,8 +723,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
  };
-@@ -130,7 +134,11 @@ static void del_conn(struct work_struct
+@@ -143,7 +147,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);
  	}
  
-@@ -380,7 +388,11 @@ static struct attribute_group bt_host_gr
+@@ -363,7 +371,11 @@ static struct attribute_group bt_host_gr
  	.attrs = bt_host_attrs,
  };
  
@@ -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
-@@ -582,7 +582,14 @@ static int l2cap_sock_setsockopt_old(str
+@@ -528,7 +528,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;
-@@ -1072,8 +1079,12 @@ static struct sock *l2cap_sock_alloc(str
+@@ -1018,8 +1025,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;
  
-@@ -1085,7 +1096,11 @@ static int l2cap_sock_create(struct net
+@@ -1031,7 +1042,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 7358f29d..cd029c7e 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
-@@ -1236,6 +1236,7 @@ void ieee80211_if_remove(struct ieee8021
+@@ -1237,6 +1237,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;
-@@ -1256,6 +1257,22 @@ void ieee80211_remove_interfaces(struct
+@@ -1257,6 +1258,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 f221ef11..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
-@@ -1473,6 +1473,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();
-@@ -2208,7 +2212,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 2dfcf5c0..fae58f0a 100644
--- a/patches/25-multicast-list_head.patch
+++ b/patches/25-multicast-list_head.patch
@@ -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
-@@ -2593,11 +2593,20 @@ struct wl1271_filter_params {
+@@ -2611,11 +2611,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))
-@@ -2610,16 +2619,40 @@ static u64 wl1271_op_prepare_multicast(s
+@@ -2628,16 +2637,40 @@ static u64 wl1271_op_prepare_multicast(s
  	}
  
  	/* update multicast filtering parameters */
@@ -637,7 +637,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
  	return hash.low | ((u64)hash.high << 32);
 --- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
 +++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
-@@ -157,7 +157,11 @@ static void _brcmf_set_multicast_list(st
+@@ -140,7 +140,11 @@ static void _brcmf_set_multicast_list(st
  	netdev_for_each_mc_addr(ha, ndev) {
  		if (!cnt)
  			break;
@@ -712,7 +712,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
  
 --- a/net/mac80211/ieee80211_i.h
 +++ b/net/mac80211/ieee80211_i.h
-@@ -797,7 +797,12 @@ struct ieee80211_local {
+@@ -801,7 +801,12 @@ struct ieee80211_local {
  	struct work_struct recalc_smps;
  
  	/* aggregated multicast list */
@@ -727,7 +727,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
  
 --- a/net/mac80211/iface.c
 +++ b/net/mac80211/iface.c
-@@ -447,8 +447,13 @@ static void ieee80211_do_stop(struct iee
+@@ -448,8 +448,13 @@ static void ieee80211_do_stop(struct iee
  
  	netif_addr_lock_bh(sdata->dev);
  	spin_lock_bh(&local->filter_lock);
@@ -741,7 +741,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
  	spin_unlock_bh(&local->filter_lock);
  	netif_addr_unlock_bh(sdata->dev);
  
-@@ -616,7 +621,12 @@ static void ieee80211_set_multicast_list
+@@ -617,7 +622,12 @@ static void ieee80211_set_multicast_list
  		sdata->flags ^= IEEE80211_SDATA_PROMISC;
  	}
  	spin_lock_bh(&local->filter_lock);
@@ -768,7 +768,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856
  	spin_unlock_bh(&local->filter_lock);
  
  	/* be a bit nasty */
-@@ -607,9 +611,11 @@ struct ieee80211_hw *ieee80211_alloc_hw(
+@@ -604,9 +608,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/30-bridge-port.patch b/patches/30-bridge-port.patch
index 47954a07..3703a3f9 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
-@@ -1599,7 +1599,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/36-workqueue.patch b/patches/36-workqueue.patch
index 04e183ad..2258df7f 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
-@@ -1106,6 +1106,10 @@ static void __exit ieee80211_exit(void)
+@@ -1103,6 +1103,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 58b93d29..1818dc43 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
-@@ -4124,7 +4124,9 @@ static int nl80211_dump_scan(struct sk_b
+@@ -4152,7 +4152,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 aa96ecb6..0c1a7086 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
-@@ -5321,16 +5321,20 @@ static int __devexit wl12xx_remove(struc
+@@ -5318,16 +5318,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 c30e9a23..622b6ce9 100644
--- a/patches/46-use_other_workqueue.patch
+++ b/patches/46-use_other_workqueue.patch
@@ -4,9 +4,9 @@ position before.
 
 --- a/net/bluetooth/hci_core.c
 +++ b/net/bluetooth/hci_core.c
-@@ -1534,8 +1534,12 @@ int hci_register_dev(struct hci_dev *hde
+@@ -1530,8 +1530,12 @@ int hci_register_dev(struct hci_dev *hde
  
- 	write_unlock_bh(&hci_dev_list_lock);
+ 	write_unlock(&hci_dev_list_lock);
  
 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37))
  	hdev->workqueue = alloc_workqueue(hdev->name, WQ_HIGHPRI | WQ_UNBOUND |