* [PATCH 0/7] backports: bring backports to next-20150313
@ 2015-04-05 22:13 Hauke Mehrtens
2015-04-05 22:13 ` [PATCH 1/7] headers: add sock_skb_cb_check_size() Hauke Mehrtens
` (6 more replies)
0 siblings, 7 replies; 9+ messages in thread
From: Hauke Mehrtens @ 2015-04-05 22:13 UTC (permalink / raw)
To: backports; +Cc: Hauke Mehrtens
These patches are adding some more stuff needed for using next-20150313.
Hauke Mehrtens (7):
headers: add sock_skb_cb_check_size()
patches: adapt function signature of recvmsg sendmsg
patches: add missing import to rhashtable
backports: add Cisco/Aironet (AIRO) driver
backports: add Atmel at76c50x PCI and PCMCIA driver
backports: add USB ZD1201 driver
patches: refresh on next-20150313
backport/backport-include/net/sock.h | 5 +
backport/defconfigs/wifi | 6 +
copy-list | 9 +
dependencies | 4 +
patches/backport-adjustments/rhashtable.patch | 10 +
.../network/0025-usb-sg/usbnet.patch | 12 +-
.../network/0027-genl-const/hwsim.patch | 2 +-
.../network/0028-select_queue/mwifiex.patch | 2 +-
.../network/0046-mmc_rescan_entered/mwifiex.patch | 2 +-
.../network/0050-iov_iter/bluetooth.patch | 4 +-
.../0053-remove_wait_on_bit_timeout/btusb.patch | 12 +-
.../0054-struct-proto_ops-sig/bluetooth.patch | 212 +++++++++++++++++++++
.../0054-struct-proto_ops-sig/ieee802154.patch | 79 ++++++++
.../network/0054-struct-proto_ops-sig/nfc.patch | 59 ++++++
14 files changed, 401 insertions(+), 17 deletions(-)
create mode 100644 patches/backport-adjustments/rhashtable.patch
create mode 100644 patches/collateral-evolutions/network/0054-struct-proto_ops-sig/bluetooth.patch
create mode 100644 patches/collateral-evolutions/network/0054-struct-proto_ops-sig/ieee802154.patch
create mode 100644 patches/collateral-evolutions/network/0054-struct-proto_ops-sig/nfc.patch
--
1.9.1
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 1/7] headers: add sock_skb_cb_check_size()
2015-04-05 22:13 [PATCH 0/7] backports: bring backports to next-20150313 Hauke Mehrtens
@ 2015-04-05 22:13 ` Hauke Mehrtens
2015-04-05 22:13 ` [PATCH 2/7] patches: adapt function signature of recvmsg sendmsg Hauke Mehrtens
` (5 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Hauke Mehrtens @ 2015-04-05 22:13 UTC (permalink / raw)
To: backports; +Cc: Hauke Mehrtens
The bluetooth code needs this function. It was introduced in upstream
commit b4772ef87.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
backport/backport-include/net/sock.h | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/backport/backport-include/net/sock.h b/backport/backport-include/net/sock.h
index ec67b9e..1a0a415 100644
--- a/backport/backport-include/net/sock.h
+++ b/backport/backport-include/net/sock.h
@@ -38,4 +38,9 @@
#define SOCK_SELECT_ERR_QUEUE (SOCK_QUEUE_SHRUNK + 14)
#endif
+#ifndef sock_skb_cb_check_size
+#define sock_skb_cb_check_size(size) \
+ BUILD_BUG_ON((size) > FIELD_SIZEOF(struct sk_buff, cb))
+#endif
+
#endif /* __BACKPORT_NET_SOCK_H */
--
1.9.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 2/7] patches: adapt function signature of recvmsg sendmsg
2015-04-05 22:13 [PATCH 0/7] backports: bring backports to next-20150313 Hauke Mehrtens
2015-04-05 22:13 ` [PATCH 1/7] headers: add sock_skb_cb_check_size() Hauke Mehrtens
@ 2015-04-05 22:13 ` Hauke Mehrtens
2015-04-05 22:13 ` [PATCH 3/7] patches: add missing import to rhashtable Hauke Mehrtens
` (4 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Hauke Mehrtens @ 2015-04-05 22:13 UTC (permalink / raw)
To: backports; +Cc: Hauke Mehrtens
The function signature of the members recvmsg sendmsg of the structure
proto_ops changed. The first parameter was removed for kernel 4.1 in
commit 1b7841404. This patch adds back the old signature of older
kernel versions.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
.../0054-struct-proto_ops-sig/bluetooth.patch | 212 +++++++++++++++++++++
.../0054-struct-proto_ops-sig/ieee802154.patch | 79 ++++++++
.../network/0054-struct-proto_ops-sig/nfc.patch | 59 ++++++
3 files changed, 350 insertions(+)
create mode 100644 patches/collateral-evolutions/network/0054-struct-proto_ops-sig/bluetooth.patch
create mode 100644 patches/collateral-evolutions/network/0054-struct-proto_ops-sig/ieee802154.patch
create mode 100644 patches/collateral-evolutions/network/0054-struct-proto_ops-sig/nfc.patch
diff --git a/patches/collateral-evolutions/network/0054-struct-proto_ops-sig/bluetooth.patch b/patches/collateral-evolutions/network/0054-struct-proto_ops-sig/bluetooth.patch
new file mode 100644
index 0000000..d752dba
--- /dev/null
+++ b/patches/collateral-evolutions/network/0054-struct-proto_ops-sig/bluetooth.patch
@@ -0,0 +1,212 @@
+--- a/include/net/bluetooth/bluetooth.h
++++ b/include/net/bluetooth/bluetooth.h
+@@ -245,10 +245,17 @@ int bt_sock_register(int proto, const s
+ void bt_sock_unregister(int proto);
+ void bt_sock_link(struct bt_sock_list *l, struct sock *s);
+ void bt_sock_unlink(struct bt_sock_list *l, struct sock *s);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0)
+ int bt_sock_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,
+ int flags);
+ int bt_sock_stream_recvmsg(struct socket *sock, struct msghdr *msg,
+ size_t len, int flags);
++#else
++int bt_sock_recvmsg(struct kiocb *iocb, struct socket *sock,
++ struct msghdr *msg, size_t len, int flags);
++int bt_sock_stream_recvmsg(struct kiocb *iocb, struct socket *sock,
++ struct msghdr *msg, size_t len, int flags);
++#endif
+ uint bt_sock_poll(struct file *file, struct socket *sock, poll_table *wait);
+ int bt_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg);
+ int bt_sock_wait_state(struct sock *sk, int state, unsigned long timeo);
+--- a/net/bluetooth/af_bluetooth.c
++++ b/net/bluetooth/af_bluetooth.c
+@@ -210,8 +210,13 @@ struct sock *bt_accept_dequeue(struct so
+ }
+ EXPORT_SYMBOL(bt_accept_dequeue);
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0)
+ int bt_sock_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,
+ int flags)
++#else
++int bt_sock_recvmsg(struct kiocb *iocb, struct socket *sock,
++ struct msghdr *msg, size_t len, int flags)
++#endif
+ {
+ int noblock = flags & MSG_DONTWAIT;
+ struct sock *sk = sock->sk;
+@@ -283,8 +288,13 @@ static long bt_sock_data_wait(struct soc
+ return timeo;
+ }
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0)
+ int bt_sock_stream_recvmsg(struct socket *sock, struct msghdr *msg,
+ size_t size, int flags)
++#else
++int bt_sock_stream_recvmsg(struct kiocb *iocb, struct socket *sock,
++ struct msghdr *msg, size_t size, int flags)
++#endif
+ {
+ struct sock *sk = sock->sk;
+ int err = 0;
+--- a/net/bluetooth/hci_sock.c
++++ b/net/bluetooth/hci_sock.c
+@@ -853,8 +853,13 @@ static void hci_sock_cmsg(struct sock *s
+ }
+ }
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0)
+ static int hci_sock_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,
+ int flags)
++#else
++static int hci_sock_recvmsg(struct kiocb *iocb, struct socket *sock,
++ struct msghdr *msg, size_t len, int flags)
++#endif
+ {
+ int noblock = flags & MSG_DONTWAIT;
+ struct sock *sk = sock->sk;
+@@ -901,8 +906,13 @@ static int hci_sock_recvmsg(struct socke
+ return err ? : copied;
+ }
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0)
+ static int hci_sock_sendmsg(struct socket *sock, struct msghdr *msg,
+ size_t len)
++#else
++static int hci_sock_sendmsg(struct kiocb *iocb, struct socket *sock,
++ struct msghdr *msg, size_t len)
++#endif
+ {
+ struct sock *sk = sock->sk;
+ struct hci_mgmt_chan *chan;
+--- a/net/bluetooth/l2cap_sock.c
++++ b/net/bluetooth/l2cap_sock.c
+@@ -944,8 +944,13 @@ static int l2cap_sock_setsockopt(struct
+ return err;
+ }
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0)
+ static int l2cap_sock_sendmsg(struct socket *sock, struct msghdr *msg,
+ size_t len)
++#else
++static int l2cap_sock_sendmsg(struct kiocb *iocb, struct socket *sock,
++ struct msghdr *msg, size_t len)
++#endif
+ {
+ struct sock *sk = sock->sk;
+ struct l2cap_chan *chan = l2cap_pi(sk)->chan;
+@@ -976,8 +981,13 @@ static int l2cap_sock_sendmsg(struct soc
+ return err;
+ }
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0)
+ static int l2cap_sock_recvmsg(struct socket *sock, struct msghdr *msg,
+ size_t len, int flags)
++#else
++static int l2cap_sock_recvmsg(struct kiocb *iocb, struct socket *sock,
++ struct msghdr *msg, size_t len, int flags)
++#endif
+ {
+ struct sock *sk = sock->sk;
+ struct l2cap_pinfo *pi = l2cap_pi(sk);
+@@ -1004,9 +1014,17 @@ static int l2cap_sock_recvmsg(struct soc
+ release_sock(sk);
+
+ if (sock->type == SOCK_STREAM)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0)
+ err = bt_sock_stream_recvmsg(sock, msg, len, flags);
++#else
++ err = bt_sock_stream_recvmsg(iocb, sock, msg, len, flags);
++#endif
+ else
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0)
+ err = bt_sock_recvmsg(sock, msg, len, flags);
++#else
++ err = bt_sock_recvmsg(iocb, sock, msg, len, flags);
++#endif
+
+ if (pi->chan->mode != L2CAP_MODE_ERTM)
+ return err;
+--- a/net/bluetooth/rfcomm/sock.c
++++ b/net/bluetooth/rfcomm/sock.c
+@@ -549,8 +549,13 @@ static int rfcomm_sock_getname(struct so
+ return 0;
+ }
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0)
+ static int rfcomm_sock_sendmsg(struct socket *sock, struct msghdr *msg,
+ size_t len)
++#else
++static int rfcomm_sock_sendmsg(struct kiocb *iocb, struct socket *sock,
++ struct msghdr *msg, size_t len)
++#endif
+ {
+ struct sock *sk = sock->sk;
+ struct rfcomm_dlc *d = rfcomm_pi(sk)->dlc;
+@@ -615,8 +620,13 @@ done:
+ return sent;
+ }
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0)
+ static int rfcomm_sock_recvmsg(struct socket *sock, struct msghdr *msg,
+ size_t size, int flags)
++#else
++static int rfcomm_sock_recvmsg(struct kiocb *iocb, struct socket *sock,
++ struct msghdr *msg, size_t size, int flags)
++#endif
+ {
+ struct sock *sk = sock->sk;
+ struct rfcomm_dlc *d = rfcomm_pi(sk)->dlc;
+@@ -627,7 +637,11 @@ static int rfcomm_sock_recvmsg(struct so
+ return 0;
+ }
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0)
+ len = bt_sock_stream_recvmsg(sock, msg, size, flags);
++#else
++ len = bt_sock_stream_recvmsg(iocb, sock, msg, size, flags);
++#endif
+
+ lock_sock(sk);
+ if (!(flags & MSG_PEEK) && len > 0)
+--- a/net/bluetooth/sco.c
++++ b/net/bluetooth/sco.c
+@@ -688,8 +688,13 @@ static int sco_sock_getname(struct socke
+ return 0;
+ }
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0)
+ static int sco_sock_sendmsg(struct socket *sock, struct msghdr *msg,
+ size_t len)
++#else
++static int sco_sock_sendmsg(struct kiocb *iocb, struct socket *sock,
++ struct msghdr *msg, size_t len)
++#endif
+ {
+ struct sock *sk = sock->sk;
+ int err;
+@@ -758,8 +763,13 @@ static void sco_conn_defer_accept(struct
+ }
+ }
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0)
+ static int sco_sock_recvmsg(struct socket *sock, struct msghdr *msg,
+ size_t len, int flags)
++#else
++static int sco_sock_recvmsg(struct kiocb *iocb, struct socket *sock,
++ struct msghdr *msg, size_t len, int flags)
++#endif
+ {
+ struct sock *sk = sock->sk;
+ struct sco_pinfo *pi = sco_pi(sk);
+@@ -777,7 +787,11 @@ static int sco_sock_recvmsg(struct socke
+
+ release_sock(sk);
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0)
+ return bt_sock_recvmsg(sock, msg, len, flags);
++#else
++ return bt_sock_recvmsg(iocb, sock, msg, len, flags);
++#endif
+ }
+
+ static int sco_sock_setsockopt(struct socket *sock, int level, int optname, char __user *optval, unsigned int optlen)
diff --git a/patches/collateral-evolutions/network/0054-struct-proto_ops-sig/ieee802154.patch b/patches/collateral-evolutions/network/0054-struct-proto_ops-sig/ieee802154.patch
new file mode 100644
index 0000000..b737f44
--- /dev/null
+++ b/patches/collateral-evolutions/network/0054-struct-proto_ops-sig/ieee802154.patch
@@ -0,0 +1,79 @@
+--- a/net/ieee802154/socket.c
++++ b/net/ieee802154/socket.c
+@@ -98,12 +98,21 @@ static int ieee802154_sock_release(struc
+ return 0;
+ }
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0)
+ static int ieee802154_sock_sendmsg(struct socket *sock, struct msghdr *msg,
+ size_t len)
++#else
++static int ieee802154_sock_sendmsg(struct kiocb *iocb, struct socket *sock,
++ struct msghdr *msg, size_t len)
++#endif
+ {
+ struct sock *sk = sock->sk;
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0)
+ return sk->sk_prot->sendmsg(sk, msg, len);
++#else
++ return sk->sk_prot->sendmsg(iocb, sk, msg, len);
++#endif
+ }
+
+ static int ieee802154_sock_bind(struct socket *sock, struct sockaddr *uaddr,
+@@ -255,7 +264,12 @@ static int raw_disconnect(struct sock *s
+ return 0;
+ }
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0)
+ static int raw_sendmsg(struct sock *sk, struct msghdr *msg, size_t size)
++#else
++static int raw_sendmsg(struct kiocb *iocb, struct sock *sk,
++ struct msghdr *msg, size_t size)
++#endif
+ {
+ struct net_device *dev;
+ unsigned int mtu;
+@@ -326,8 +340,13 @@ out:
+ return err;
+ }
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0)
+ static int raw_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,
+ int noblock, int flags, int *addr_len)
++#else
++static int raw_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
++ size_t len, int noblock, int flags, int *addr_len)
++#endif
+ {
+ size_t copied = 0;
+ int err = -EOPNOTSUPP;
+@@ -614,7 +633,12 @@ static int dgram_disconnect(struct sock
+ return 0;
+ }
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0)
+ static int dgram_sendmsg(struct sock *sk, struct msghdr *msg, size_t size)
++#else
++static int dgram_sendmsg(struct kiocb *iocb, struct sock *sk,
++ struct msghdr *msg, size_t size)
++#endif
+ {
+ struct net_device *dev;
+ unsigned int mtu;
+@@ -713,8 +737,14 @@ out:
+ return err;
+ }
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0)
+ static int dgram_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,
+ int noblock, int flags, int *addr_len)
++#else
++static int dgram_recvmsg(struct kiocb *iocb, struct sock *sk,
++ struct msghdr *msg, size_t len, int noblock,
++ int flags, int *addr_len)
++#endif
+ {
+ size_t copied = 0;
+ int err = -EOPNOTSUPP;
diff --git a/patches/collateral-evolutions/network/0054-struct-proto_ops-sig/nfc.patch b/patches/collateral-evolutions/network/0054-struct-proto_ops-sig/nfc.patch
new file mode 100644
index 0000000..3bc5fc0
--- /dev/null
+++ b/patches/collateral-evolutions/network/0054-struct-proto_ops-sig/nfc.patch
@@ -0,0 +1,59 @@
+--- a/net/nfc/llcp_sock.c
++++ b/net/nfc/llcp_sock.c
+@@ -750,8 +750,13 @@ error:
+ return ret;
+ }
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0)
+ static int llcp_sock_sendmsg(struct socket *sock, struct msghdr *msg,
+ size_t len)
++#else
++static int llcp_sock_sendmsg(struct kiocb *iocb, struct socket *sock,
++ struct msghdr *msg, size_t len)
++#endif
+ {
+ struct sock *sk = sock->sk;
+ struct nfc_llcp_sock *llcp_sock = nfc_llcp_sock(sk);
+@@ -793,8 +798,13 @@ static int llcp_sock_sendmsg(struct sock
+ return nfc_llcp_send_i_frame(llcp_sock, msg, len);
+ }
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0)
+ static int llcp_sock_recvmsg(struct socket *sock, struct msghdr *msg,
+ size_t len, int flags)
++#else
++static int llcp_sock_recvmsg(struct kiocb *iocb, struct socket *sock,
++ struct msghdr *msg, size_t len, int flags)
++#endif
+ {
+ int noblock = flags & MSG_DONTWAIT;
+ struct sock *sk = sock->sk;
+--- a/net/nfc/rawsock.c
++++ b/net/nfc/rawsock.c
+@@ -211,7 +211,12 @@ static void rawsock_tx_work(struct work_
+ }
+ }
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0)
+ static int rawsock_sendmsg(struct socket *sock, struct msghdr *msg, size_t len)
++#else
++static int rawsock_sendmsg(struct kiocb *iocb, struct socket *sock,
++ struct msghdr *msg, size_t len)
++#endif
+ {
+ struct sock *sk = sock->sk;
+ struct nfc_dev *dev = nfc_rawsock(sk)->dev;
+@@ -247,8 +252,13 @@ static int rawsock_sendmsg(struct socket
+ return len;
+ }
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0)
+ static int rawsock_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,
+ int flags)
++#else
++static int rawsock_recvmsg(struct kiocb *iocb, struct socket *sock,
++ struct msghdr *msg, size_t len, int flags)
++#endif
+ {
+ int noblock = flags & MSG_DONTWAIT;
+ struct sock *sk = sock->sk;
--
1.9.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 3/7] patches: add missing import to rhashtable
2015-04-05 22:13 [PATCH 0/7] backports: bring backports to next-20150313 Hauke Mehrtens
2015-04-05 22:13 ` [PATCH 1/7] headers: add sock_skb_cb_check_size() Hauke Mehrtens
2015-04-05 22:13 ` [PATCH 2/7] patches: adapt function signature of recvmsg sendmsg Hauke Mehrtens
@ 2015-04-05 22:13 ` Hauke Mehrtens
2015-04-07 7:05 ` Johannes Berg
2015-04-05 22:13 ` [PATCH 4/7] backports: add Cisco/Aironet (AIRO) driver Hauke Mehrtens
` (3 subsequent siblings)
6 siblings, 1 reply; 9+ messages in thread
From: Hauke Mehrtens @ 2015-04-05 22:13 UTC (permalink / raw)
To: backports; +Cc: Hauke Mehrtens
lib-rhashtable.c misses a #include <linux/export.h> on some kernel
versions.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
patches/backport-adjustments/rhashtable.patch | 10 ++++++++++
1 file changed, 10 insertions(+)
create mode 100644 patches/backport-adjustments/rhashtable.patch
diff --git a/patches/backport-adjustments/rhashtable.patch b/patches/backport-adjustments/rhashtable.patch
new file mode 100644
index 0000000..1dd7acf
--- /dev/null
+++ b/patches/backport-adjustments/rhashtable.patch
@@ -0,0 +1,10 @@
+--- a/compat/lib-rhashtable.c
++++ b/compat/lib-rhashtable.c
+@@ -25,6 +25,7 @@
+ #include <linux/random.h>
+ #include <linux/rhashtable.h>
+ #include <linux/err.h>
++#include <linux/export.h>
+
+ #define HASH_DEFAULT_SIZE 64UL
+ #define HASH_MIN_SIZE 4UL
--
1.9.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 4/7] backports: add Cisco/Aironet (AIRO) driver
2015-04-05 22:13 [PATCH 0/7] backports: bring backports to next-20150313 Hauke Mehrtens
` (2 preceding siblings ...)
2015-04-05 22:13 ` [PATCH 3/7] patches: add missing import to rhashtable Hauke Mehrtens
@ 2015-04-05 22:13 ` Hauke Mehrtens
2015-04-05 22:13 ` [PATCH 5/7] backports: add Atmel at76c50x PCI and PCMCIA driver Hauke Mehrtens
` (2 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Hauke Mehrtens @ 2015-04-05 22:13 UTC (permalink / raw)
To: backports; +Cc: Hauke Mehrtens
This wifi driver was missing before.
This driver uses the cfg80211 so we should ship it.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
backport/defconfigs/wifi | 2 ++
copy-list | 3 +++
dependencies | 4 ++++
3 files changed, 9 insertions(+)
diff --git a/backport/defconfigs/wifi b/backport/defconfigs/wifi
index 96496ed..7e79612 100644
--- a/backport/defconfigs/wifi
+++ b/backport/defconfigs/wifi
@@ -1,5 +1,7 @@
CPTCFG_ADM8211=m
CPTCFG_AR5523=m
+CPTCFG_AIRO=m
+CPTCFG_AIRO_CS=m
CPTCFG_AT76C50X_USB=m
CPTCFG_ATH10K=m
CPTCFG_ATH10K_PCI=m
diff --git a/copy-list b/copy-list
index b581e26..7c01a43 100644
--- a/copy-list
+++ b/copy-list
@@ -54,6 +54,9 @@ drivers/ssb/
include/linux/ssb/
drivers/bcma/
include/linux/bcma/
+drivers/net/wireless/airo.c
+drivers/net/wireless/airo_cs.c
+drivers/net/wireless/airo.h
drivers/net/wireless/b43/
drivers/net/wireless/b43legacy/
drivers/net/wireless/brcm80211/
diff --git a/dependencies b/dependencies
index eead0c5..ba41d25 100644
--- a/dependencies
+++ b/dependencies
@@ -9,6 +9,10 @@ WL1251_SPI 3.5
WL1251_SDIO 3.15
WLCORE_SDIO 3.15
+# This driver uses the remove_proc_subtree() function.
+AIRO 3.9
+AIRO_CS 3.9
+
# Media
MEDIA_SUPPORT 3.2
USB_GSPCA_OV534 3.5
--
1.9.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 5/7] backports: add Atmel at76c50x PCI and PCMCIA driver
2015-04-05 22:13 [PATCH 0/7] backports: bring backports to next-20150313 Hauke Mehrtens
` (3 preceding siblings ...)
2015-04-05 22:13 ` [PATCH 4/7] backports: add Cisco/Aironet (AIRO) driver Hauke Mehrtens
@ 2015-04-05 22:13 ` Hauke Mehrtens
2015-04-05 22:13 ` [PATCH 6/7] backports: add USB ZD1201 driver Hauke Mehrtens
2015-04-05 22:13 ` [PATCH 7/7] patches: refresh on next-20150313 Hauke Mehrtens
6 siblings, 0 replies; 9+ messages in thread
From: Hauke Mehrtens @ 2015-04-05 22:13 UTC (permalink / raw)
To: backports; +Cc: Hauke Mehrtens
This wifi driver was missing before.
This driver uses the cfg80211 so we should ship it.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
backport/defconfigs/wifi | 3 +++
copy-list | 4 ++++
2 files changed, 7 insertions(+)
diff --git a/backport/defconfigs/wifi b/backport/defconfigs/wifi
index 7e79612..e329440 100644
--- a/backport/defconfigs/wifi
+++ b/backport/defconfigs/wifi
@@ -12,6 +12,7 @@ CPTCFG_ATH6KL_USB=m
CPTCFG_ATH9K_HTC=m
CPTCFG_ATH9K=m
CPTCFG_ATH_CARDS=m
+CPTCFG_ATMEL=m
CPTCFG_B43LEGACY=m
CPTCFG_B43=m
CPTCFG_B43_PCMCIA=y
@@ -68,7 +69,9 @@ CPTCFG_P54_COMMON=m
CPTCFG_P54_PCI=m
CPTCFG_P54_SPI=m
CPTCFG_P54_USB=m
+CPTCFG_PCI_ATMEL=m
CPTCFG_PCI_HERMES=m
+CPTCFG_PCMCIA_ATMEL=m
CPTCFG_PCMCIA_HERMES=m
CPTCFG_PCMCIA_SPECTRUM=m
CPTCFG_PLX_HERMES=m
diff --git a/copy-list b/copy-list
index 7c01a43..3c94979 100644
--- a/copy-list
+++ b/copy-list
@@ -57,6 +57,10 @@ include/linux/bcma/
drivers/net/wireless/airo.c
drivers/net/wireless/airo_cs.c
drivers/net/wireless/airo.h
+drivers/net/wireless/atmel.c
+drivers/net/wireless/atmel_cs.c
+drivers/net/wireless/atmel.h
+drivers/net/wireless/atmel_pci.c
drivers/net/wireless/b43/
drivers/net/wireless/b43legacy/
drivers/net/wireless/brcm80211/
--
1.9.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 6/7] backports: add USB ZD1201 driver
2015-04-05 22:13 [PATCH 0/7] backports: bring backports to next-20150313 Hauke Mehrtens
` (4 preceding siblings ...)
2015-04-05 22:13 ` [PATCH 5/7] backports: add Atmel at76c50x PCI and PCMCIA driver Hauke Mehrtens
@ 2015-04-05 22:13 ` Hauke Mehrtens
2015-04-05 22:13 ` [PATCH 7/7] patches: refresh on next-20150313 Hauke Mehrtens
6 siblings, 0 replies; 9+ messages in thread
From: Hauke Mehrtens @ 2015-04-05 22:13 UTC (permalink / raw)
To: backports; +Cc: Hauke Mehrtens
This wifi driver was missing before.
This driver uses the cfg80211 so we should ship it.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
backport/defconfigs/wifi | 1 +
copy-list | 2 ++
2 files changed, 3 insertions(+)
diff --git a/backport/defconfigs/wifi b/backport/defconfigs/wifi
index e329440..3d26444 100644
--- a/backport/defconfigs/wifi
+++ b/backport/defconfigs/wifi
@@ -106,6 +106,7 @@ CPTCFG_SSB_PCMCIAHOST=y
CPTCFG_SSB_SDIOHOST=y
CPTCFG_TMD_HERMES=m
CPTCFG_USB_NET_RNDIS_WLAN=m
+CPTCFG_USB_ZD1201=m
CPTCFG_WCN36XX=m
CPTCFG_WIL6210=m
CPTCFG_WL1251=m
diff --git a/copy-list b/copy-list
index 3c94979..ed9c26a 100644
--- a/copy-list
+++ b/copy-list
@@ -87,6 +87,8 @@ drivers/net/wireless/mac80211_hwsim.h
drivers/net/wireless/mwl8k.c
drivers/net/wireless/rsi/
drivers/net/wireless/rndis_wlan.c
+drivers/net/wireless/zd1201.c
+drivers/net/wireless/zd1201.h
# rndis also requires some of the USB networking
drivers/net/usb/Makefile
drivers/net/usb/Kconfig
--
1.9.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 7/7] patches: refresh on next-20150313
2015-04-05 22:13 [PATCH 0/7] backports: bring backports to next-20150313 Hauke Mehrtens
` (5 preceding siblings ...)
2015-04-05 22:13 ` [PATCH 6/7] backports: add USB ZD1201 driver Hauke Mehrtens
@ 2015-04-05 22:13 ` Hauke Mehrtens
6 siblings, 0 replies; 9+ messages in thread
From: Hauke Mehrtens @ 2015-04-05 22:13 UTC (permalink / raw)
To: backports; +Cc: Hauke Mehrtens
1 3.0.101 [ OK ]
2 3.1.10 [ OK ]
3 3.2.68 [ OK ]
4 3.3.8 [ OK ]
5 3.4.106 [ OK ]
6 3.5.7 [ OK ]
7 3.6.11 [ OK ]
8 3.7.10 [ OK ]
9 3.8.13 [ OK ]
10 3.9.11 [ OK ]
11 3.10.73 [ OK ]
12 3.11.10 [ OK ]
13 3.12.39 [ OK ]
14 3.13.11 [ OK ]
15 3.14.37 [ OK ]
16 3.15.10 [ OK ]
17 3.16.7 [ OK ]
18 3.17.8 [ OK ]
19 3.18.10 [ OK ]
20 3.19.3 [ OK ]
21 4.0-rc6 [ OK ]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
.../collateral-evolutions/network/0025-usb-sg/usbnet.patch | 12 ++++++------
.../network/0027-genl-const/hwsim.patch | 2 +-
.../network/0028-select_queue/mwifiex.patch | 2 +-
.../network/0046-mmc_rescan_entered/mwifiex.patch | 2 +-
.../network/0050-iov_iter/bluetooth.patch | 4 ++--
.../network/0053-remove_wait_on_bit_timeout/btusb.patch | 12 ++++++------
6 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/patches/collateral-evolutions/network/0025-usb-sg/usbnet.patch b/patches/collateral-evolutions/network/0025-usb-sg/usbnet.patch
index 6d556b9..8616213 100644
--- a/patches/collateral-evolutions/network/0025-usb-sg/usbnet.patch
+++ b/patches/collateral-evolutions/network/0025-usb-sg/usbnet.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
-@@ -1251,6 +1251,7 @@ EXPORT_SYMBOL_GPL(usbnet_tx_timeout);
+@@ -1250,6 +1250,7 @@ EXPORT_SYMBOL_GPL(usbnet_tx_timeout);
/*-------------------------------------------------------------------------*/
@@ -8,7 +8,7 @@
static int build_dma_sg(const struct sk_buff *skb, struct urb *urb)
{
unsigned num_sgs, total_len = 0;
-@@ -1283,6 +1284,12 @@ static int build_dma_sg(const struct sk_
+@@ -1282,6 +1283,12 @@ static int build_dma_sg(const struct sk_
return 1;
}
@@ -21,7 +21,7 @@
netdev_tx_t usbnet_start_xmit (struct sk_buff *skb,
struct net_device *net)
-@@ -1339,12 +1346,19 @@ netdev_tx_t usbnet_start_xmit (struct sk
+@@ -1338,12 +1345,19 @@ netdev_tx_t usbnet_start_xmit (struct sk
if (!(info->flags & FLAG_SEND_ZLP)) {
if (!(info->flags & FLAG_MULTI_PACKET)) {
length++;
@@ -41,7 +41,7 @@
}
} else
urb->transfer_flags |= URB_ZERO_PACKET;
-@@ -1399,7 +1413,9 @@ not_drop:
+@@ -1400,7 +1414,9 @@ not_drop:
if (skb)
dev_kfree_skb_any (skb);
if (urb) {
@@ -51,7 +51,7 @@
usb_free_urb(urb);
}
} else
-@@ -1452,7 +1468,9 @@ static void usbnet_bh (unsigned long par
+@@ -1453,7 +1469,9 @@ static void usbnet_bh (unsigned long par
rx_process (dev, skb);
continue;
case tx_done:
@@ -61,7 +61,7 @@
case rx_cleanup:
usb_free_urb (entry->urb);
dev_kfree_skb (skb);
-@@ -1808,7 +1826,9 @@ int usbnet_resume (struct usb_interface
+@@ -1809,7 +1827,9 @@ int usbnet_resume (struct usb_interface
retval = usb_submit_urb(res, GFP_ATOMIC);
if (retval < 0) {
dev_kfree_skb_any(skb);
diff --git a/patches/collateral-evolutions/network/0027-genl-const/hwsim.patch b/patches/collateral-evolutions/network/0027-genl-const/hwsim.patch
index 9f87acb..0383c30 100644
--- a/patches/collateral-evolutions/network/0027-genl-const/hwsim.patch
+++ b/patches/collateral-evolutions/network/0027-genl-const/hwsim.patch
@@ -9,7 +9,7 @@
[HWSIM_MCGRP_CONFIG] = { .name = "config", },
};
-@@ -2942,7 +2942,7 @@ done:
+@@ -2945,7 +2945,7 @@ done:
}
/* Generic Netlink operations array */
diff --git a/patches/collateral-evolutions/network/0028-select_queue/mwifiex.patch b/patches/collateral-evolutions/network/0028-select_queue/mwifiex.patch
index 046801c..7026737 100644
--- a/patches/collateral-evolutions/network/0028-select_queue/mwifiex.patch
+++ b/patches/collateral-evolutions/network/0028-select_queue/mwifiex.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/mwifiex/main.c
+++ b/drivers/net/wireless/mwifiex/main.c
-@@ -920,9 +920,19 @@ static struct net_device_stats *mwifiex_
+@@ -922,9 +922,19 @@ static struct net_device_stats *mwifiex_
return &priv->stats;
}
diff --git a/patches/collateral-evolutions/network/0046-mmc_rescan_entered/mwifiex.patch b/patches/collateral-evolutions/network/0046-mmc_rescan_entered/mwifiex.patch
index bfbbb7b..63a295f 100644
--- a/patches/collateral-evolutions/network/0046-mmc_rescan_entered/mwifiex.patch
+++ b/patches/collateral-evolutions/network/0046-mmc_rescan_entered/mwifiex.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/mwifiex/sdio.c
+++ b/drivers/net/wireless/mwifiex/sdio.c
-@@ -1967,7 +1967,9 @@ static void mwifiex_sdio_card_reset_work
+@@ -1968,7 +1968,9 @@ static void mwifiex_sdio_card_reset_work
mmc_remove_host(target);
/* 200ms delay is based on experiment with sdhci controller */
mdelay(200);
diff --git a/patches/collateral-evolutions/network/0050-iov_iter/bluetooth.patch b/patches/collateral-evolutions/network/0050-iov_iter/bluetooth.patch
index 8939638..836a177 100644
--- a/patches/collateral-evolutions/network/0050-iov_iter/bluetooth.patch
+++ b/patches/collateral-evolutions/network/0050-iov_iter/bluetooth.patch
@@ -175,7 +175,7 @@
l2cap_chan_send(chan, &msg, 1 + len);
-@@ -2871,6 +2876,9 @@ static const struct l2cap_ops smp_chan_o
+@@ -2877,6 +2882,9 @@ static const struct l2cap_ops smp_chan_o
.suspend = l2cap_chan_no_suspend,
.set_shutdown = l2cap_chan_no_set_shutdown,
.get_sndtimeo = l2cap_chan_no_get_sndtimeo,
@@ -185,7 +185,7 @@
};
static inline struct l2cap_chan *smp_new_conn_cb(struct l2cap_chan *pchan)
-@@ -2919,6 +2927,9 @@ static const struct l2cap_ops smp_root_c
+@@ -2925,6 +2933,9 @@ static const struct l2cap_ops smp_root_c
.resume = l2cap_chan_no_resume,
.set_shutdown = l2cap_chan_no_set_shutdown,
.get_sndtimeo = l2cap_chan_no_get_sndtimeo,
diff --git a/patches/collateral-evolutions/network/0053-remove_wait_on_bit_timeout/btusb.patch b/patches/collateral-evolutions/network/0053-remove_wait_on_bit_timeout/btusb.patch
index e4b5b28..0ba2509 100644
--- a/patches/collateral-evolutions/network/0053-remove_wait_on_bit_timeout/btusb.patch
+++ b/patches/collateral-evolutions/network/0053-remove_wait_on_bit_timeout/btusb.patch
@@ -1,6 +1,6 @@
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
-@@ -1806,8 +1806,12 @@ static int btusb_recv_event_intel(struct
+@@ -1823,8 +1823,12 @@ static int btusb_recv_event_intel(struct
if (test_and_clear_bit(BTUSB_DOWNLOADING,
&data->flags) &&
test_bit(BTUSB_FIRMWARE_LOADED, &data->flags)) {
@@ -13,7 +13,7 @@
}
}
-@@ -1818,8 +1822,12 @@ static int btusb_recv_event_intel(struct
+@@ -1835,8 +1839,12 @@ static int btusb_recv_event_intel(struct
if (skb->len == 9 && hdr->evt == 0xff && hdr->plen == 0x07 &&
skb->data[2] == 0x02) {
if (test_and_clear_bit(BTUSB_BOOTING, &data->flags)) {
@@ -26,7 +26,7 @@
}
}
}
-@@ -2187,6 +2195,7 @@ static int btusb_setup_intel_new(struct
+@@ -2204,6 +2212,7 @@ static int btusb_setup_intel_new(struct
* and thus just timeout if that happens and fail the setup
* of this device.
*/
@@ -34,7 +34,7 @@
err = wait_on_bit_timeout(&data->flags, BTUSB_DOWNLOADING,
TASK_INTERRUPTIBLE,
msecs_to_jiffies(5000));
-@@ -2201,6 +2210,31 @@ static int btusb_setup_intel_new(struct
+@@ -2218,6 +2227,31 @@ static int btusb_setup_intel_new(struct
err = -ETIMEDOUT;
goto done;
}
@@ -66,7 +66,7 @@
if (test_bit(BTUSB_FIRMWARE_FAILED, &data->flags)) {
BT_ERR("%s: Firmware loading failed", hdev->name);
-@@ -2240,6 +2274,7 @@ done:
+@@ -2257,6 +2291,7 @@ done:
*/
BT_INFO("%s: Waiting for device to boot", hdev->name);
@@ -74,7 +74,7 @@
err = wait_on_bit_timeout(&data->flags, BTUSB_BOOTING,
TASK_INTERRUPTIBLE,
msecs_to_jiffies(1000));
-@@ -2253,6 +2288,33 @@ done:
+@@ -2270,6 +2305,33 @@ done:
BT_ERR("%s: Device boot timeout", hdev->name);
return -ETIMEDOUT;
}
--
1.9.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 3/7] patches: add missing import to rhashtable
2015-04-05 22:13 ` [PATCH 3/7] patches: add missing import to rhashtable Hauke Mehrtens
@ 2015-04-07 7:05 ` Johannes Berg
0 siblings, 0 replies; 9+ messages in thread
From: Johannes Berg @ 2015-04-07 7:05 UTC (permalink / raw)
To: Hauke Mehrtens; +Cc: backports
On Mon, 2015-04-06 at 00:13 +0200, Hauke Mehrtens wrote:
> lib-rhashtable.c misses a #include <linux/export.h> on some kernel
> versions.
Should perhaps send that upstream?
johannes
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2015-04-07 7:05 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-04-05 22:13 [PATCH 0/7] backports: bring backports to next-20150313 Hauke Mehrtens
2015-04-05 22:13 ` [PATCH 1/7] headers: add sock_skb_cb_check_size() Hauke Mehrtens
2015-04-05 22:13 ` [PATCH 2/7] patches: adapt function signature of recvmsg sendmsg Hauke Mehrtens
2015-04-05 22:13 ` [PATCH 3/7] patches: add missing import to rhashtable Hauke Mehrtens
2015-04-07 7:05 ` Johannes Berg
2015-04-05 22:13 ` [PATCH 4/7] backports: add Cisco/Aironet (AIRO) driver Hauke Mehrtens
2015-04-05 22:13 ` [PATCH 5/7] backports: add Atmel at76c50x PCI and PCMCIA driver Hauke Mehrtens
2015-04-05 22:13 ` [PATCH 6/7] backports: add USB ZD1201 driver Hauke Mehrtens
2015-04-05 22:13 ` [PATCH 7/7] patches: refresh on next-20150313 Hauke Mehrtens
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.