From: Luis R. Rodriguez Date: Fri, 17 Feb 2012 23:56:07 +0000 (-0800) Subject: compat-wireless: refresh patches X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=0276b50c0794a0a7d52a38efe2c0909ca7718066;p=openwrt%2Fstaging%2Fblogic.git compat-wireless: refresh patches This synchs with next-20120217. Signed-off-by: Luis R. Rodriguez --- diff --git a/patches/16-bluetooth.patch b/patches/16-bluetooth.patch index 3f433075fe02..be5c643ce9b2 100644 --- a/patches/16-bluetooth.patch +++ b/patches/16-bluetooth.patch @@ -41,7 +41,7 @@ here still, but for now we keep this here. --- a/net/bluetooth/af_bluetooth.c +++ b/net/bluetooth/af_bluetooth.c -@@ -125,8 +125,12 @@ int bt_sock_unregister(int proto) +@@ -122,8 +122,12 @@ int bt_sock_unregister(int proto) } EXPORT_SYMBOL(bt_sock_unregister); @@ -54,7 +54,7 @@ here still, but for now we keep this here. { int err; -@@ -144,7 +148,11 @@ static int bt_sock_create(struct net *ne +@@ -141,7 +145,11 @@ static int bt_sock_create(struct net *ne read_lock(&bt_proto_lock); if (bt_proto[proto] && try_module_get(bt_proto[proto]->owner)) { @@ -63,10 +63,10 @@ here still, but for now we keep this here. +#else + err = bt_proto[proto]->create(net, sock, proto); +#endif - if (!err) - bt_sock_reclassify_lock(sock->sk, proto); + if (!err) + bt_sock_reclassify_lock(sock->sk, proto); module_put(bt_proto[proto]->owner); -@@ -475,7 +483,11 @@ int bt_sock_ioctl(struct socket *sock, u +@@ -473,7 +481,11 @@ int bt_sock_ioctl(struct socket *sock, u if (sk->sk_state == BT_LISTEN) return -EINVAL; @@ -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; -@@ -1020,8 +1027,12 @@ static struct sock *l2cap_sock_alloc(str +@@ -1022,8 +1029,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; -@@ -1033,7 +1044,11 @@ static int l2cap_sock_create(struct net +@@ -1035,7 +1046,11 @@ static int l2cap_sock_create(struct net sock->type != SOCK_DGRAM && sock->type != SOCK_RAW) return -ESOCKTNOSUPPORT; diff --git a/patches/25-multicast-list_head.patch b/patches/25-multicast-list_head.patch index d6423794e839..b80ec63b05a7 100644 --- a/patches/25-multicast-list_head.patch +++ b/patches/25-multicast-list_head.patch @@ -321,7 +321,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 p += sprintf(p, "num_tx_bytes = %lu\n", priv->stats.tx_bytes); --- a/drivers/net/wireless/mwl8k.c +++ b/drivers/net/wireless/mwl8k.c -@@ -2564,15 +2564,21 @@ struct mwl8k_cmd_mac_multicast_adr { +@@ -2563,15 +2563,21 @@ struct mwl8k_cmd_mac_multicast_adr { static struct mwl8k_cmd_pkt * __mwl8k_cmd_mac_multicast_adr(struct ieee80211_hw *hw, int allmulti, @@ -343,7 +343,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 if (allmulti || mc_count > priv->num_mcaddrs) { allmulti = 1; -@@ -2593,13 +2599,27 @@ __mwl8k_cmd_mac_multicast_adr(struct iee +@@ -2592,13 +2598,27 @@ __mwl8k_cmd_mac_multicast_adr(struct iee if (allmulti) { cmd->action |= cpu_to_le16(MWL8K_ENABLE_RX_ALL_MULTICAST); } else if (mc_count) { @@ -371,7 +371,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 } } -@@ -4823,7 +4843,11 @@ mwl8k_bss_info_changed(struct ieee80211_ +@@ -4822,7 +4842,11 @@ mwl8k_bss_info_changed(struct ieee80211_ } static u64 mwl8k_prepare_multicast(struct ieee80211_hw *hw, @@ -383,7 +383,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 { struct mwl8k_cmd_pkt *cmd; -@@ -4834,7 +4858,11 @@ static u64 mwl8k_prepare_multicast(struc +@@ -4833,7 +4857,11 @@ static u64 mwl8k_prepare_multicast(struc * we'll end up throwing this packet away and creating a new * one in mwl8k_configure_filter(). */ @@ -395,7 +395,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 return (unsigned long)cmd; } -@@ -4956,7 +4984,11 @@ static void mwl8k_configure_filter(struc +@@ -4955,7 +4983,11 @@ static void mwl8k_configure_filter(struc */ if (*total_flags & FIF_ALLMULTI) { kfree(cmd); diff --git a/patches/46-use_other_workqueue.patch b/patches/46-use_other_workqueue.patch index 622b6ce993d4..63a93241abed 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 -@@ -1530,8 +1530,12 @@ int hci_register_dev(struct hci_dev *hde +@@ -1531,8 +1531,12 @@ int hci_register_dev(struct hci_dev *hde write_unlock(&hci_dev_list_lock); diff --git a/patches/50-libertas-olpc-ec-wakeup.patch b/patches/50-libertas-olpc-ec-wakeup.patch index 13413af5e78c..a182d9b3da36 100644 --- a/patches/50-libertas-olpc-ec-wakeup.patch +++ b/patches/50-libertas-olpc-ec-wakeup.patch @@ -3,11 +3,9 @@ exist before the release of 3.1. This code in question was an addition, not a change from any existing code. It is safe to simply remove it for older kernels. -diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c -index b5fbbc7..513ae29 100644 --- a/drivers/net/wireless/libertas/if_usb.c +++ b/drivers/net/wireless/libertas/if_usb.c -@@ -1133,6 +1133,7 @@ static int if_usb_suspend(struct usb_interface *intf, pm_message_t message) +@@ -1131,6 +1131,7 @@ static int if_usb_suspend(struct usb_int if (priv->psstate != PS_STATE_FULL_POWER) return -1; @@ -15,7 +13,7 @@ index b5fbbc7..513ae29 100644 #ifdef CONFIG_OLPC if (machine_is_olpc()) { if (priv->wol_criteria == EHS_REMOVE_WAKEUP) -@@ -1141,6 +1142,7 @@ static int if_usb_suspend(struct usb_interface *intf, pm_message_t message) +@@ -1139,6 +1140,7 @@ static int if_usb_suspend(struct usb_int olpc_ec_wakeup_set(EC_SCI_SRC_WLAN); } #endif