* [PATCH 00/16] backports: bring to next-20140117
@ 2014-01-19 16:47 Hauke Mehrtens
2014-01-19 16:47 ` [PATCH 01/16] backports: adapt to changes in netdev select_queue call Hauke Mehrtens
` (15 more replies)
0 siblings, 16 replies; 18+ messages in thread
From: Hauke Mehrtens @ 2014-01-19 16:47 UTC (permalink / raw
To: mcgrof; +Cc: backports, Hauke Mehrtens
This brings backports to next-20140117.
In addition that this contains a fix for a build error on RHEL 6.5, see
add prefix infront of ether_addr_equal_{unaligned,64bits}() and it
fixes some non critical warnings.
1 2.6.25 [ OK ]
2 2.6.26 [ OK ]
3 2.6.27 [ OK ]
4 2.6.28 [ OK ]
5 2.6.29 [ OK ]
6 2.6.30 [ OK ]
7 2.6.31 [ OK ]
8 2.6.32 [ OK ]
9 2.6.33 [ OK ]
10 2.6.34 [ OK ]
11 2.6.35 [ OK ]
12 2.6.36 [ OK ]
13 2.6.37 [ OK ]
14 2.6.38 [ OK ]
15 2.6.39 [ OK ]
16 3.0.101 [ OK ]
17 3.1.10 [ OK ]
18 3.2.54 [ OK ]
19 3.3.8 [ OK ]
20 3.4.77 [ OK ]
21 3.5.7 [ OK ]
22 3.6.11 [ OK ]
23 3.7.10 [ OK ]
24 3.8.13 [ OK ]
25 3.9.11 [ OK ]
26 3.10.27 [ OK ]
27 3.11.10 [ OK ]
28 3.12.8 [ OK ]
29 3.13-rc8 [ OK ]
Hauke Mehrtens (16):
backports: adapt to changes in netdev select_queue call
backports: add USB_DEVICE_INTERFACE_CLASS
backports: do not activate BCMA_HOST_SOC on kernel < 3.7
backports: add sdio device id list
backports: add ATTRIBUTE_GROUPS unconditionally
backports: add linux/irqdomain.h
backports: fix header of phy_mii_ioctl()
backports: backport get_stats in alx driver
backports: add IS_BUILTIN()
backports: add prefix infront of ether_addr_equal_{unaligned,
64bits}()
backports: fix led_trigger warning with old kernel versions
backports: fix unused mwifiex_sdio_resume() warning
backports: fix unused var ret warning
backports: fix unused atl1e_rx_mode() warning
backports: fix unused hidp_get_raw_report() warning
backports: refresh on next-20140117
backport/backport-include/backport/leds-disabled.h | 13 +++++++
backport/backport-include/linux/device.h | 18 ++++++++--
backport/backport-include/linux/etherdevice.h | 3 +-
backport/backport-include/linux/irqdomain.h | 9 +++++
backport/backport-include/linux/kconfig.h | 3 ++
backport/backport-include/linux/phy.h | 10 ++++++
backport/backport-include/linux/usb.h | 18 ++++++++++
copy-list | 1 +
dependencies | 6 ++++
.../media/0004-sysfs-api.patch | 6 ++--
.../mac80211.patch | 4 +--
.../0006-disable-dump-adjust-on-old-kernels.patch | 4 +--
.../drivers_net_wireless_b43_main.patch | 6 ++--
.../drivers_net_wireless_iwlwifi_pcie_trans.patch | 4 +--
.../drivers_net_wireless_ti_wlcore_main.patch | 6 ++--
.../net_mac80211_tx.patch | 4 +--
.../16-bluetooth/net_bluetooth_hci_sysfs.patch | 26 --------------
.../16-bluetooth/net_bluetooth_hidp_core.patch | 22 ++++++++----
.../16-bluetooth/net_bluetooth_l2cap_sock.patch | 6 ++--
.../16-bluetooth/net_bluetooth_rfcomm_sock.patch | 2 +-
.../16-bluetooth/net_bluetooth_rfcomm_tty.patch | 8 ++---
.../17-netdev-queue/net_mac80211_iface.patch | 4 +--
.../network/22-multiqueue/net_mac80211_tx.patch | 2 +-
.../include_net_mac80211.patch | 2 +-
.../drivers_net_wireless_mwifiex_sdio.patch | 26 +++++++++++---
.../30-bridge-port/net_wireless_nl80211.patch | 2 +-
.../drivers_net_wireless_ath_main.patch | 6 ++--
.../drivers_net_ethernet_atheros_alx_main.patch | 4 +--
...ers_net_ethernet_atheros_atl1c_atl1c_main.patch | 6 ++--
...ers_net_ethernet_atheros_atl1e_atl1e_main.patch | 26 +++++++++++---
.../drivers_net_ethernet_atheros_atlx_atl1.patch | 8 ++---
.../42-netlink_seq/net_wireless_nl80211.patch | 2 +-
.../drivers_net_wireless_b43_main.patch | 2 +-
...ers_net_ethernet_atheros_atl1c_atl1c_main.patch | 2 +-
.../drivers_net_ethernet_atheros_atlx_atl1.patch | 2 +-
.../63-tty-termios/net_bluetooth_rfcomm_tty.patch | 2 +-
.../network/64-b44-32bit-stats/alx.patch | 36 ++++++++++++++++++++
.../69-wowlan-no-socket/net_wireless_nl80211.patch | 2 +-
.../network/76-sysfs-api/drivers_ssb.patch | 2 +-
.../network/81-genl-const/hwsim.patch | 2 +-
.../network/81-genl-const/nl80211.patch | 6 ++--
.../82-struct_property_missing/mwifiex.patch | 10 ++++--
.../network/83-select_queue/INFO | 9 +++++
.../network/83-select_queue/mac80211.patch | 34 ++++++++++++++++++
.../network/83-select_queue/mwifiex.patch | 19 +++++++++++
45 files changed, 294 insertions(+), 101 deletions(-)
create mode 100644 backport/backport-include/linux/irqdomain.h
delete mode 100644 patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hci_sysfs.patch
create mode 100644 patches/collateral-evolutions/network/64-b44-32bit-stats/alx.patch
create mode 100644 patches/collateral-evolutions/network/83-select_queue/INFO
create mode 100644 patches/collateral-evolutions/network/83-select_queue/mac80211.patch
create mode 100644 patches/collateral-evolutions/network/83-select_queue/mwifiex.patch
--
1.7.10.4
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH 01/16] backports: adapt to changes in netdev select_queue call
2014-01-19 16:47 [PATCH 00/16] backports: bring to next-20140117 Hauke Mehrtens
@ 2014-01-19 16:47 ` Hauke Mehrtens
2014-01-19 17:00 ` Grumbach, Emmanuel
2014-01-19 16:47 ` [PATCH 02/16] backports: add USB_DEVICE_INTERFACE_CLASS Hauke Mehrtens
` (14 subsequent siblings)
15 siblings, 1 reply; 18+ messages in thread
From: Hauke Mehrtens @ 2014-01-19 16:47 UTC (permalink / raw
To: mcgrof; +Cc: backports, Hauke Mehrtens, Emmanuel Grumbach
This patch reverts the changes done in the following commit for older
kernel versions:
commit f663dd9aaf9ed124f25f0f8452edf238f087ad50
Author: Jason Wang <jasowang@redhat.com>
Date: Fri Jan 10 16:18:26 2014 +0800
net: core: explicitly select a txq before doing l2 forwarding
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
CC: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
---
.../network/83-select_queue/INFO | 9 ++++++
.../network/83-select_queue/mac80211.patch | 34 ++++++++++++++++++++
.../network/83-select_queue/mwifiex.patch | 19 +++++++++++
3 files changed, 62 insertions(+)
create mode 100644 patches/collateral-evolutions/network/83-select_queue/INFO
create mode 100644 patches/collateral-evolutions/network/83-select_queue/mac80211.patch
create mode 100644 patches/collateral-evolutions/network/83-select_queue/mwifiex.patch
diff --git a/patches/collateral-evolutions/network/83-select_queue/INFO b/patches/collateral-evolutions/network/83-select_queue/INFO
new file mode 100644
index 0000000..6925ef7
--- /dev/null
+++ b/patches/collateral-evolutions/network/83-select_queue/INFO
@@ -0,0 +1,9 @@
+backports: adapt to changes in netdev select_queue call
+
+This patch reverts the changes done in the following commit for older
+kernel versions:
+commit f663dd9aaf9ed124f25f0f8452edf238f087ad50
+Author: Jason Wang <jasowang@redhat.com>
+Date: Fri Jan 10 16:18:26 2014 +0800
+
+ net: core: explicitly select a txq before doing l2 forwarding
diff --git a/patches/collateral-evolutions/network/83-select_queue/mac80211.patch b/patches/collateral-evolutions/network/83-select_queue/mac80211.patch
new file mode 100644
index 0000000..0e61876
--- /dev/null
+++ b/patches/collateral-evolutions/network/83-select_queue/mac80211.patch
@@ -0,0 +1,34 @@
+diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
+index 3dfd20a..0696aec 100644
+--- a/net/mac80211/iface.c
++++ b/net/mac80211/iface.c
+@@ -1054,9 +1054,14 @@ static void ieee80211_uninit(struct net_
+ ieee80211_teardown_sdata(IEEE80211_DEV_TO_SUB_IF(dev));
+ }
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,0)
+ static u16 ieee80211_netdev_select_queue(struct net_device *dev,
+ struct sk_buff *skb,
+ void *accel_priv)
++#else
++static u16 ieee80211_netdev_select_queue(struct net_device *dev,
++ struct sk_buff *skb)
++#endif
+ {
+ return ieee80211_select_queue(IEEE80211_DEV_TO_SUB_IF(dev), skb);
+ }
+@@ -1072,9 +1077,14 @@ static const struct net_device_ops ieee8
+ .ndo_select_queue = ieee80211_netdev_select_queue,
+ };
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,0)
+ static u16 ieee80211_monitor_select_queue(struct net_device *dev,
+ struct sk_buff *skb,
+ void *accel_priv)
++#else
++static u16 ieee80211_monitor_select_queue(struct net_device *dev,
++ struct sk_buff *skb)
++#endif
+ {
+ struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+ struct ieee80211_local *local = sdata->local;
diff --git a/patches/collateral-evolutions/network/83-select_queue/mwifiex.patch b/patches/collateral-evolutions/network/83-select_queue/mwifiex.patch
new file mode 100644
index 0000000..78292d2
--- /dev/null
+++ b/patches/collateral-evolutions/network/83-select_queue/mwifiex.patch
@@ -0,0 +1,19 @@
+diff --git a/drivers/net/wireless/mwifiex/main.c b/drivers/net/wireless/mwifiex/main.c
+index 4d79761..8bd0316 100644
+--- a/drivers/net/wireless/mwifiex/main.c
++++ b/drivers/net/wireless/mwifiex/main.c
+@@ -746,9 +746,14 @@ static struct net_device_stats *mwifiex_
+ return &priv->stats;
+ }
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,0)
+ static u16
+ mwifiex_netdev_select_wmm_queue(struct net_device *dev, struct sk_buff *skb,
+ void *accel_priv)
++#else
++static u16
++mwifiex_netdev_select_wmm_queue(struct net_device *dev, struct sk_buff *skb)
++#endif
+ {
+ skb->priority = cfg80211_classify8021d(skb, NULL);
+ return mwifiex_1d_to_wmm_queue[skb->priority];
--
1.7.10.4
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 02/16] backports: add USB_DEVICE_INTERFACE_CLASS
2014-01-19 16:47 [PATCH 00/16] backports: bring to next-20140117 Hauke Mehrtens
2014-01-19 16:47 ` [PATCH 01/16] backports: adapt to changes in netdev select_queue call Hauke Mehrtens
@ 2014-01-19 16:47 ` Hauke Mehrtens
2014-01-19 16:47 ` [PATCH 03/16] backports: do not activate BCMA_HOST_SOC on kernel < 3.7 Hauke Mehrtens
` (13 subsequent siblings)
15 siblings, 0 replies; 18+ messages in thread
From: Hauke Mehrtens @ 2014-01-19 16:47 UTC (permalink / raw
To: mcgrof; +Cc: backports, Hauke Mehrtens
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
backport/backport-include/linux/usb.h | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/backport/backport-include/linux/usb.h b/backport/backport-include/linux/usb.h
index 08ae0f2..a0cfa37 100644
--- a/backport/backport-include/linux/usb.h
+++ b/backport/backport-include/linux/usb.h
@@ -53,6 +53,24 @@
.idProduct = (prod)
#endif /* USB_DEVICE_INTERFACE_NUMBER */
+#ifndef USB_DEVICE_INTERFACE_CLASS
+/**
+ * USB_DEVICE_INTERFACE_CLASS - describe a usb device with a specific interface class
+ * @vend: the 16 bit USB Vendor ID
+ * @prod: the 16 bit USB Product ID
+ * @cl: bInterfaceClass value
+ *
+ * This macro is used to create a struct usb_device_id that matches a
+ * specific interface class of devices.
+ */
+#define USB_DEVICE_INTERFACE_CLASS(vend, prod, cl) \
+ .match_flags = USB_DEVICE_ID_MATCH_DEVICE | \
+ USB_DEVICE_ID_MATCH_INT_CLASS, \
+ .idVendor = (vend), \
+ .idProduct = (prod), \
+ .bInterfaceClass = (cl)
+#endif /* USB_DEVICE_INTERFACE_CLASS */
+
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36)
#ifdef CPTCFG_BACKPORT_OPTION_USB_URB_THREAD_FIX
#define usb_scuttle_anchored_urbs LINUX_BACKPORT(usb_scuttle_anchored_urbs)
--
1.7.10.4
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 03/16] backports: do not activate BCMA_HOST_SOC on kernel < 3.7
2014-01-19 16:47 [PATCH 00/16] backports: bring to next-20140117 Hauke Mehrtens
2014-01-19 16:47 ` [PATCH 01/16] backports: adapt to changes in netdev select_queue call Hauke Mehrtens
2014-01-19 16:47 ` [PATCH 02/16] backports: add USB_DEVICE_INTERFACE_CLASS Hauke Mehrtens
@ 2014-01-19 16:47 ` Hauke Mehrtens
2014-01-19 16:47 ` [PATCH 04/16] backports: add sdio device id list Hauke Mehrtens
` (12 subsequent siblings)
15 siblings, 0 replies; 18+ messages in thread
From: Hauke Mehrtens @ 2014-01-19 16:47 UTC (permalink / raw
To: mcgrof; +Cc: backports, Hauke Mehrtens
drivers/bcma/driver_gpio.c calls irq_set_chip_and_handler() when
BCMA_HOST_SOC is activated. irq_set_chip_and_handler() gets exported on
kernel >= 3.7, we should not activate this on any older kernel.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
dependencies | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/dependencies b/dependencies
index 4eabc25..7f6b95a 100644
--- a/dependencies
+++ b/dependencies
@@ -183,6 +183,12 @@ BCMA_DRIVER_GPIO 3.0
BCMA_DRIVER_MIPS 3.3
SSB_DRIVER_MIPS 3.3
+# the irq handler in the gpio driver uses
+# irq_set_chip_and_handler_name() which gets exported starting with
+# kernel 3.7. This code is only compiled if BCMA_DRIVER_GPIO and
+# BCMA_HOST_SOC are set.
+BCMA_HOST_SOC 3.7
+
# rfkill-regulator uses a kernel header file
# (rfkill-regulator.h) that we don't backport
# right now, so make it depend on 3.0
--
1.7.10.4
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 04/16] backports: add sdio device id list
2014-01-19 16:47 [PATCH 00/16] backports: bring to next-20140117 Hauke Mehrtens
` (2 preceding siblings ...)
2014-01-19 16:47 ` [PATCH 03/16] backports: do not activate BCMA_HOST_SOC on kernel < 3.7 Hauke Mehrtens
@ 2014-01-19 16:47 ` Hauke Mehrtens
2014-01-19 16:47 ` [PATCH 05/16] backports: add ATTRIBUTE_GROUPS unconditionally Hauke Mehrtens
` (11 subsequent siblings)
15 siblings, 0 replies; 18+ messages in thread
From: Hauke Mehrtens @ 2014-01-19 16:47 UTC (permalink / raw
To: mcgrof; +Cc: backports, Hauke Mehrtens
This copies the sdio device id list into backprots, this is used by
brcmfmac.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
copy-list | 1 +
1 file changed, 1 insertion(+)
diff --git a/copy-list b/copy-list
index 307ab00..c516135 100644
--- a/copy-list
+++ b/copy-list
@@ -22,6 +22,7 @@ include/linux/wireless.h
include/uapi/linux/wireless.h
include/linux/ieee80211.h
include/linux/pci_ids.h
+include/linux/mmc/sdio_ids.h
include/linux/ath9k_platform.h
include/linux/wl12xx.h
include/linux/rndis.h
--
1.7.10.4
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 05/16] backports: add ATTRIBUTE_GROUPS unconditionally
2014-01-19 16:47 [PATCH 00/16] backports: bring to next-20140117 Hauke Mehrtens
` (3 preceding siblings ...)
2014-01-19 16:47 ` [PATCH 04/16] backports: add sdio device id list Hauke Mehrtens
@ 2014-01-19 16:47 ` Hauke Mehrtens
2014-01-19 16:47 ` [PATCH 06/16] backports: add linux/irqdomain.h Hauke Mehrtens
` (10 subsequent siblings)
15 siblings, 0 replies; 18+ messages in thread
From: Hauke Mehrtens @ 2014-01-19 16:47 UTC (permalink / raw
To: mcgrof; +Cc: backports, Hauke Mehrtens
net/bluetooth/hci_sysfs.c uses ATTRIBUTE_GROUPS on all kernel versions.
Now it has to be for older kernel versions as well and
__ATTRIBUTE_GROUPS is also needed for these old versions.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
backport/backport-include/linux/device.h | 18 ++++++++++++--
.../16-bluetooth/net_bluetooth_hci_sysfs.patch | 26 --------------------
2 files changed, 16 insertions(+), 28 deletions(-)
delete mode 100644 patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hci_sysfs.patch
diff --git a/backport/backport-include/linux/device.h b/backport/backport-include/linux/device.h
index 5eda359..aa91c62 100644
--- a/backport/backport-include/linux/device.h
+++ b/backport/backport-include/linux/device.h
@@ -211,7 +211,22 @@ static void init_##_name##_attrs(void) \
attr); \
}
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0)
+#ifndef __ATTRIBUTE_GROUPS
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,31))
+#define __ATTRIBUTE_GROUPS(_name) \
+static const struct attribute_group *_name##_groups[] = { \
+ &_name##_group, \
+ NULL, \
+}
+#else
+#define __ATTRIBUTE_GROUPS(_name) \
+static struct attribute_group *_name##_groups[] = { \
+ &_name##_group, \
+ NULL, \
+}
+#endif /* (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,31)) */
+#endif /* __ATTRIBUTE_GROUPS */
+
#undef ATTRIBUTE_GROUPS
#define ATTRIBUTE_GROUPS(_name) \
static const struct attribute_group _name##_group = { \
@@ -219,7 +234,6 @@ static const struct attribute_group _name##_group = { \
}; \
static inline void init_##_name##_attrs(void) {} \
__ATTRIBUTE_GROUPS(_name)
-#endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,32)
#define dev_get_platdata LINUX_BACKPORT(dev_get_platdata)
diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hci_sysfs.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hci_sysfs.patch
deleted file mode 100644
index 404f588..0000000
--- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hci_sysfs.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/net/bluetooth/hci_sysfs.c
-+++ b/net/bluetooth/hci_sysfs.c
-@@ -53,7 +53,11 @@ static struct attribute_group bt_link_gr
- .attrs = bt_link_attrs,
- };
-
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,31))
- static const struct attribute_group *bt_link_groups[] = {
-+#else
-+static struct attribute_group *bt_link_groups[] = {
-+#endif
- &bt_link_group,
- NULL
- };
-@@ -186,7 +190,11 @@ static struct attribute_group bt_host_gr
- .attrs = bt_host_attrs,
- };
-
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,31))
- static const struct attribute_group *bt_host_groups[] = {
-+#else
-+static struct attribute_group *bt_host_groups[] = {
-+#endif
- &bt_host_group,
- NULL
- };
--
1.7.10.4
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 06/16] backports: add linux/irqdomain.h
2014-01-19 16:47 [PATCH 00/16] backports: bring to next-20140117 Hauke Mehrtens
` (4 preceding siblings ...)
2014-01-19 16:47 ` [PATCH 05/16] backports: add ATTRIBUTE_GROUPS unconditionally Hauke Mehrtens
@ 2014-01-19 16:47 ` Hauke Mehrtens
2014-01-19 16:47 ` [PATCH 07/16] backports: fix header of phy_mii_ioctl() Hauke Mehrtens
` (9 subsequent siblings)
15 siblings, 0 replies; 18+ messages in thread
From: Hauke Mehrtens @ 2014-01-19 16:47 UTC (permalink / raw
To: mcgrof; +Cc: backports, Hauke Mehrtens
ssb uses this header file, but does not use any of the functions in
there in the default config, because that is only used when
SSB_DRIVER_GPIO and SSB_EMBEDDED are activated.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
backport/backport-include/linux/irqdomain.h | 9 +++++++++
1 file changed, 9 insertions(+)
create mode 100644 backport/backport-include/linux/irqdomain.h
diff --git a/backport/backport-include/linux/irqdomain.h b/backport/backport-include/linux/irqdomain.h
new file mode 100644
index 0000000..a889a29
--- /dev/null
+++ b/backport/backport-include/linux/irqdomain.h
@@ -0,0 +1,9 @@
+#ifndef __BACKPORT_LINUX_IRQDOMAIN_H
+#define __BACKPORT_LINUX_IRQDOMAIN_H
+#include <linux/version.h>
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0)
+#include_next <linux/irqdomain.h>
+#endif
+
+#endif /* __BACKPORT_LINUX_IRQDOMAIN_H */
--
1.7.10.4
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 07/16] backports: fix header of phy_mii_ioctl()
2014-01-19 16:47 [PATCH 00/16] backports: bring to next-20140117 Hauke Mehrtens
` (5 preceding siblings ...)
2014-01-19 16:47 ` [PATCH 06/16] backports: add linux/irqdomain.h Hauke Mehrtens
@ 2014-01-19 16:47 ` Hauke Mehrtens
2014-01-19 16:47 ` [PATCH 08/16] backports: backport get_stats in alx driver Hauke Mehrtens
` (8 subsequent siblings)
15 siblings, 0 replies; 18+ messages in thread
From: Hauke Mehrtens @ 2014-01-19 16:47 UTC (permalink / raw
To: mcgrof; +Cc: backports, Hauke Mehrtens
On kernel versions < 2.6.36 phy_mii_ioctl() gets struct mii_ioctl_data
as second parameter and on more recent kernel versions it takes struct
ifreq. This patch converts one version to the other.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
backport/backport-include/linux/phy.h | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/backport/backport-include/linux/phy.h b/backport/backport-include/linux/phy.h
index 4473e4e..ff2aacf 100644
--- a/backport/backport-include/linux/phy.h
+++ b/backport/backport-include/linux/phy.h
@@ -8,4 +8,14 @@
phy_connect(dev, bus_id, handler, 0, interface)
#endif
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36))
+#include <linux/mii.h>
+static inline int backport_phy_mii_ioctl(struct phy_device *phydev,
+ struct ifreq *ifr, int cmd)
+{
+ return phy_mii_ioctl(phydev, if_mii(ifr), cmd);
+}
+#define phy_mii_ioctl LINUX_BACKPORT(phy_mii_ioctl)
+#endif
+
#endif /* __BACKPORT_LINUX_PHY_H */
--
1.7.10.4
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 08/16] backports: backport get_stats in alx driver
2014-01-19 16:47 [PATCH 00/16] backports: bring to next-20140117 Hauke Mehrtens
` (6 preceding siblings ...)
2014-01-19 16:47 ` [PATCH 07/16] backports: fix header of phy_mii_ioctl() Hauke Mehrtens
@ 2014-01-19 16:47 ` Hauke Mehrtens
2014-01-19 16:47 ` [PATCH 09/16] backports: add IS_BUILTIN() Hauke Mehrtens
` (7 subsequent siblings)
15 siblings, 0 replies; 18+ messages in thread
From: Hauke Mehrtens @ 2014-01-19 16:47 UTC (permalink / raw
To: mcgrof; +Cc: backports, Hauke Mehrtens
alx_get_stats64() was added recently to alx driver, but on kernel <
2.6.30 only get_stats is available, convert the function on such
kernels to use the old api.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
.../network/64-b44-32bit-stats/alx.patch | 36 ++++++++++++++++++++
1 file changed, 36 insertions(+)
create mode 100644 patches/collateral-evolutions/network/64-b44-32bit-stats/alx.patch
diff --git a/patches/collateral-evolutions/network/64-b44-32bit-stats/alx.patch b/patches/collateral-evolutions/network/64-b44-32bit-stats/alx.patch
new file mode 100644
index 0000000..9e4e6d9
--- /dev/null
+++ b/patches/collateral-evolutions/network/64-b44-32bit-stats/alx.patch
@@ -0,0 +1,36 @@
+diff --git a/drivers/net/ethernet/atheros/alx/main.c b/drivers/net/ethernet/atheros/alx/main.c
+index e92ffd6..78bf4f4 100644
+--- a/drivers/net/ethernet/atheros/alx/main.c
++++ b/drivers/net/ethernet/atheros/alx/main.c
+@@ -1180,11 +1180,19 @@ static void alx_poll_controller(struct n
+ }
+ #endif
+
++
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36))
+ static struct rtnl_link_stats64 *alx_get_stats64(struct net_device *dev,
+ struct rtnl_link_stats64 *net_stats)
++#else
++static struct net_device_stats *alx_get_stats(struct net_device *dev)
++#endif
+ {
+ struct alx_priv *alx = netdev_priv(dev);
+ struct alx_hw_stats *hw_stats = &alx->hw.stats;
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36))
++ struct net_device_stats *net_stats = &dev->stats;
++#endif
+
+ spin_lock(&alx->stats_lock);
+
+@@ -1233,7 +1241,11 @@ static const struct net_device_ops alx_n
+ .ndo_open = alx_open,
+ .ndo_stop = alx_stop,
+ .ndo_start_xmit = alx_start_xmit,
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36))
+ .ndo_get_stats64 = alx_get_stats64,
++#else
++ .ndo_get_stats = alx_get_stats,
++#endif
+ .ndo_set_rx_mode = alx_set_rx_mode,
+ .ndo_validate_addr = eth_validate_addr,
+ .ndo_set_mac_address = alx_set_mac_address,
--
1.7.10.4
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 09/16] backports: add IS_BUILTIN()
2014-01-19 16:47 [PATCH 00/16] backports: bring to next-20140117 Hauke Mehrtens
` (7 preceding siblings ...)
2014-01-19 16:47 ` [PATCH 08/16] backports: backport get_stats in alx driver Hauke Mehrtens
@ 2014-01-19 16:47 ` Hauke Mehrtens
2014-01-19 16:47 ` [PATCH 10/16] backports: add prefix infront of ether_addr_equal_{unaligned, 64bits}() Hauke Mehrtens
` (6 subsequent siblings)
15 siblings, 0 replies; 18+ messages in thread
From: Hauke Mehrtens @ 2014-01-19 16:47 UTC (permalink / raw
To: mcgrof; +Cc: backports, Hauke Mehrtens
This is needed by bcma.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
backport/backport-include/linux/kconfig.h | 3 +++
1 file changed, 3 insertions(+)
diff --git a/backport/backport-include/linux/kconfig.h b/backport/backport-include/linux/kconfig.h
index d5c483d..ee938e3 100644
--- a/backport/backport-include/linux/kconfig.h
+++ b/backport/backport-include/linux/kconfig.h
@@ -21,4 +21,7 @@
(config_enabled(option) || config_enabled(option##_MODULE))
#endif
+#undef IS_BUILTIN
+#define IS_BUILTIN(option) config_enabled(option)
+
#endif
--
1.7.10.4
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 10/16] backports: add prefix infront of ether_addr_equal_{unaligned, 64bits}()
2014-01-19 16:47 [PATCH 00/16] backports: bring to next-20140117 Hauke Mehrtens
` (8 preceding siblings ...)
2014-01-19 16:47 ` [PATCH 09/16] backports: add IS_BUILTIN() Hauke Mehrtens
@ 2014-01-19 16:47 ` Hauke Mehrtens
2014-01-19 16:47 ` [PATCH 11/16] backports: fix led_trigger warning with old kernel versions Hauke Mehrtens
` (5 subsequent siblings)
15 siblings, 0 replies; 18+ messages in thread
From: Hauke Mehrtens @ 2014-01-19 16:47 UTC (permalink / raw
To: mcgrof; +Cc: backports, Hauke Mehrtens
RedHat 6.5 already contains ether_addr_equal_64bits() which will
conflict with our declaration.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
backport/backport-include/linux/etherdevice.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/backport/backport-include/linux/etherdevice.h b/backport/backport-include/linux/etherdevice.h
index cf1e31f..5560c0c 100644
--- a/backport/backport-include/linux/etherdevice.h
+++ b/backport/backport-include/linux/etherdevice.h
@@ -172,7 +172,7 @@ static inline void eth_hw_addr_inherit(struct net_device *dst,
*
* Please note that alignment of addr1 & addr2 are only guaranteed to be 16 bits.
*/
-
+#define ether_addr_equal_64bits LINUX_BACKPORT(ether_addr_equal_64bits)
static inline bool ether_addr_equal_64bits(const u8 addr1[6+2],
const u8 addr2[6+2])
{
@@ -200,6 +200,7 @@ static inline bool ether_addr_equal_64bits(const u8 addr1[6+2],
*
* Please note: Use only when any Ethernet address may not be u16 aligned.
*/
+#define ether_addr_equal_unaligned LINUX_BACKPORT(ether_addr_equal_unaligned)
static inline bool ether_addr_equal_unaligned(const u8 *addr1, const u8 *addr2)
{
#if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS)
--
1.7.10.4
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 11/16] backports: fix led_trigger warning with old kernel versions
2014-01-19 16:47 [PATCH 00/16] backports: bring to next-20140117 Hauke Mehrtens
` (9 preceding siblings ...)
2014-01-19 16:47 ` [PATCH 10/16] backports: add prefix infront of ether_addr_equal_{unaligned, 64bits}() Hauke Mehrtens
@ 2014-01-19 16:47 ` Hauke Mehrtens
2014-01-19 16:47 ` [PATCH 12/16] backports: fix unused mwifiex_sdio_resume() warning Hauke Mehrtens
` (4 subsequent siblings)
15 siblings, 0 replies; 18+ messages in thread
From: Hauke Mehrtens @ 2014-01-19 16:47 UTC (permalink / raw
To: mcgrof; +Cc: backports, Hauke Mehrtens
This fixes the following warning:
/drivers/net/wireless/at76c50x-usb.c: In function ‘at76_mod_init’:
/drivers/net/wireless/at76c50x-usb.c:2472:2: warning: passing argument 2 of ‘led_trigger_register_simple’ from incompatible pointer type [enabled by default]
led_trigger_register_simple("at76_usb-tx", &ledtrig_tx);
^
In file included from /backport-include/linux/leds.h:3:0,
from /drivers/net/wireless/at76c50x-usb.c:45:
include/linux/leds.h:97:13: note: expected ‘struct led_trigger **’ but argument is of type ‘struct backport_led_trigger **’
extern void led_trigger_register_simple(const char *name,
^
/drivers/net/wireless/at76c50x-usb.c: In function ‘at76_mod_exit’:
/drivers/net/wireless/at76c50x-usb.c:2484:2: warning: passing argument 1 of ‘led_trigger_unregister_simple’ from incompatible pointer type [enabled by default]
led_trigger_unregister_simple(ledtrig_tx);
^
In file included from /backport-include/linux/leds.h:3:0,
from /drivers/net/wireless/at76c50x-usb.c:45:
include/linux/leds.h:99:13: note: expected ‘struct led_trigger *’ but argument is of type ‘struct backport_led_trigger *’
extern void led_trigger_unregister_simple(struct led_trigger *trigger);
^
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
backport/backport-include/backport/leds-disabled.h | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/backport/backport-include/backport/leds-disabled.h b/backport/backport-include/backport/leds-disabled.h
index 1a9abec..634b62f 100644
--- a/backport/backport-include/backport/leds-disabled.h
+++ b/backport/backport-include/backport/leds-disabled.h
@@ -99,6 +99,10 @@ struct led_trigger {
#define led_trigger_register LINUX_BACKPORT(led_trigger_register)
#undef led_trigger_unregister
#define led_trigger_unregister LINUX_BACKPORT(led_trigger_unregister)
+#undef led_trigger_register_simple
+#define led_trigger_register_simple LINUX_BACKPORT(led_trigger_register_simple)
+#undef led_trigger_unregister_simple
+#define led_trigger_unregister_simple LINUX_BACKPORT(led_trigger_unregister_simple)
#undef led_trigger_event
#define led_trigger_event LINUX_BACKPORT(led_trigger_event)
@@ -115,6 +119,15 @@ static inline void led_classdev_unregister(struct led_classdev *led_cdev)
{
}
+static inline void led_trigger_register_simple(const char *name,
+ struct led_trigger **trigger)
+{
+}
+
+static inline void led_trigger_unregister_simple(struct led_trigger *trigger)
+{
+}
+
static inline void led_blink_set(struct led_classdev *led_cdev,
unsigned long *delay_on,
unsigned long *delay_off)
--
1.7.10.4
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 12/16] backports: fix unused mwifiex_sdio_resume() warning
2014-01-19 16:47 [PATCH 00/16] backports: bring to next-20140117 Hauke Mehrtens
` (10 preceding siblings ...)
2014-01-19 16:47 ` [PATCH 11/16] backports: fix led_trigger warning with old kernel versions Hauke Mehrtens
@ 2014-01-19 16:47 ` Hauke Mehrtens
2014-01-19 16:47 ` [PATCH 13/16] backports: fix unused var ret warning Hauke Mehrtens
` (3 subsequent siblings)
15 siblings, 0 replies; 18+ messages in thread
From: Hauke Mehrtens @ 2014-01-19 16:47 UTC (permalink / raw
To: mcgrof; +Cc: backports, Hauke Mehrtens
This fixes the following warning:
/drivers/net/wireless/mwifiex/sdio.c:124:12: warning: ‘mwifiex_sdio_resume’ defined but not used [-Wunused-function]
static int mwifiex_sdio_resume(struct device *dev)
^
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
.../drivers_net_wireless_mwifiex_sdio.patch | 26 ++++++++++++++++----
1 file changed, 21 insertions(+), 5 deletions(-)
diff --git a/patches/collateral-evolutions/network/29-sdio_no_suspend/drivers_net_wireless_mwifiex_sdio.patch b/patches/collateral-evolutions/network/29-sdio_no_suspend/drivers_net_wireless_mwifiex_sdio.patch
index 11a3039..21b8109 100644
--- a/patches/collateral-evolutions/network/29-sdio_no_suspend/drivers_net_wireless_mwifiex_sdio.patch
+++ b/patches/collateral-evolutions/network/29-sdio_no_suspend/drivers_net_wireless_mwifiex_sdio.patch
@@ -1,6 +1,22 @@
--- a/drivers/net/wireless/mwifiex/sdio.c
+++ b/drivers/net/wireless/mwifiex/sdio.c
-@@ -183,8 +183,10 @@ mwifiex_sdio_remove(struct sdio_func *fu
+@@ -111,6 +111,7 @@ mwifiex_sdio_probe(struct sdio_func *fun
+ return ret;
+ }
+
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34))
+ /*
+ * SDIO resume.
+ *
+@@ -155,6 +156,7 @@ static int mwifiex_sdio_resume(struct de
+
+ return 0;
+ }
++#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) */
+
+ /*
+ * SDIO remove.
+@@ -183,8 +185,10 @@ mwifiex_sdio_remove(struct sdio_func *fu
wait_for_completion(&adapter->fw_load);
if (user_rmmod) {
@@ -11,7 +27,7 @@
for (i = 0; i < adapter->priv_num; i++)
if ((GET_BSS_ROLE(adapter->priv[i]) ==
-@@ -200,6 +202,7 @@ mwifiex_sdio_remove(struct sdio_func *fu
+@@ -200,6 +204,7 @@ mwifiex_sdio_remove(struct sdio_func *fu
mwifiex_remove_card(card->adapter, &add_remove_card_sem);
}
@@ -19,7 +35,7 @@
/*
* SDIO suspend.
*
-@@ -254,6 +257,7 @@ static int mwifiex_sdio_suspend(struct d
+@@ -254,6 +259,7 @@ static int mwifiex_sdio_suspend(struct d
return ret;
}
@@ -27,7 +43,7 @@
/* Device ID for SD8786 */
#define SDIO_DEVICE_ID_MARVELL_8786 (0x9116)
-@@ -279,10 +283,12 @@ static const struct sdio_device_id mwifi
+@@ -279,10 +285,12 @@ static const struct sdio_device_id mwifi
MODULE_DEVICE_TABLE(sdio, mwifiex_ids);
@@ -40,7 +56,7 @@
static struct sdio_driver mwifiex_sdio = {
.name = "mwifiex_sdio",
-@@ -291,7 +297,9 @@ static struct sdio_driver mwifiex_sdio =
+@@ -291,7 +299,9 @@ static struct sdio_driver mwifiex_sdio =
.remove = mwifiex_sdio_remove,
.drv = {
.owner = THIS_MODULE,
--
1.7.10.4
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 13/16] backports: fix unused var ret warning
2014-01-19 16:47 [PATCH 00/16] backports: bring to next-20140117 Hauke Mehrtens
` (11 preceding siblings ...)
2014-01-19 16:47 ` [PATCH 12/16] backports: fix unused mwifiex_sdio_resume() warning Hauke Mehrtens
@ 2014-01-19 16:47 ` Hauke Mehrtens
2014-01-19 16:47 ` [PATCH 14/16] backports: fix unused atl1e_rx_mode() warning Hauke Mehrtens
` (2 subsequent siblings)
15 siblings, 0 replies; 18+ messages in thread
From: Hauke Mehrtens @ 2014-01-19 16:47 UTC (permalink / raw
To: mcgrof; +Cc: backports, Hauke Mehrtens
This fixes the following warning:
/drivers/net/wireless/mwifiex/sta_cmd.c: In function ‘mwifiex_cmd_cfg_data’:
/drivers/net/wireless/mwifiex/sta_cmd.c:1196:6: warning: unused variable ‘ret’ [-Wunused-variable]
int ret;
^
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
.../network/82-struct_property_missing/mwifiex.patch | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/patches/collateral-evolutions/network/82-struct_property_missing/mwifiex.patch b/patches/collateral-evolutions/network/82-struct_property_missing/mwifiex.patch
index d3712db..ac882e6 100644
--- a/patches/collateral-evolutions/network/82-struct_property_missing/mwifiex.patch
+++ b/patches/collateral-evolutions/network/82-struct_property_missing/mwifiex.patch
@@ -8,15 +8,19 @@
/*
* This function prepares command to set/get RSSI information.
-@@ -1194,6 +1195,7 @@ static int mwifiex_cmd_cfg_data(struct m
- int ret;
+@@ -1192,9 +1193,10 @@ static int mwifiex_cmd_cfg_data(struct m
+ struct property *prop = data_buf;
+ u32 len;
+ u8 *data = (u8 *)cmd + S_DS_GEN;
+- int ret;
if (prop) {
+#if defined(CONFIG_OF) || (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39))
++ int ret;
len = prop->length;
ret = of_property_read_u8_array(adapter->dt_node, prop->name,
data, len);
-@@ -1201,6 +1203,9 @@ static int mwifiex_cmd_cfg_data(struct m
+@@ -1202,6 +1204,9 @@ static int mwifiex_cmd_cfg_data(struct m
return ret;
dev_dbg(adapter->dev,
"download cfg_data from device tree: %s\n", prop->name);
--
1.7.10.4
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 14/16] backports: fix unused atl1e_rx_mode() warning
2014-01-19 16:47 [PATCH 00/16] backports: bring to next-20140117 Hauke Mehrtens
` (12 preceding siblings ...)
2014-01-19 16:47 ` [PATCH 13/16] backports: fix unused var ret warning Hauke Mehrtens
@ 2014-01-19 16:47 ` Hauke Mehrtens
2014-01-19 16:47 ` [PATCH 15/16] backports: fix unused hidp_get_raw_report() warning Hauke Mehrtens
2014-01-19 16:47 ` [PATCH 16/16] backports: refresh on next-20140117 Hauke Mehrtens
15 siblings, 0 replies; 18+ messages in thread
From: Hauke Mehrtens @ 2014-01-19 16:47 UTC (permalink / raw
To: mcgrof; +Cc: backports, Hauke Mehrtens
This fixes the following warning:
/drivers/net/ethernet/atheros/atl1e/atl1e_main.c:328:13: warning: ‘atl1e_rx_mode’ defined but not used [-Wunused-function]
static void atl1e_rx_mode(struct net_device *netdev,
^
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
...ers_net_ethernet_atheros_atl1e_atl1e_main.patch | 26 ++++++++++++++++----
1 file changed, 21 insertions(+), 5 deletions(-)
diff --git a/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atl1e_atl1e_main.patch b/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atl1e_atl1e_main.patch
index 6927a57..72488f9 100644
--- a/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atl1e_atl1e_main.patch
+++ b/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atl1e_atl1e_main.patch
@@ -1,6 +1,22 @@
--- a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
+++ b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
-@@ -399,6 +399,7 @@ static int atl1e_set_mac_addr(struct net
+@@ -313,6 +313,7 @@ static void atl1e_set_multi(struct net_d
+ }
+ }
+
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39))
+ static void __atl1e_rx_mode(netdev_features_t features, u32 *mac_ctrl_data)
+ {
+
+@@ -339,6 +340,7 @@ static void atl1e_rx_mode(struct net_dev
+ AT_WRITE_REG(&adapter->hw, REG_MAC_CTRL, mac_ctrl_data);
+ atl1e_irq_enable(adapter);
+ }
++#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)) */
+
+
+ static void __atl1e_vlan_mode(netdev_features_t features, u32 *mac_ctrl_data)
+@@ -399,6 +401,7 @@ static int atl1e_set_mac_addr(struct net
return 0;
}
@@ -8,7 +24,7 @@
static netdev_features_t atl1e_fix_features(struct net_device *netdev,
netdev_features_t features)
{
-@@ -428,6 +429,7 @@ static int atl1e_set_features(struct net
+@@ -428,6 +431,7 @@ static int atl1e_set_features(struct net
return 0;
}
@@ -16,7 +32,7 @@
/**
* atl1e_change_mtu - Change the Maximum Transfer Unit
-@@ -1987,7 +1989,11 @@ void atl1e_down(struct atl1e_adapter *ad
+@@ -1995,7 +1999,11 @@ void atl1e_down(struct atl1e_adapter *ad
* reschedule our watchdog timer */
set_bit(__AT_DOWN, &adapter->flags);
@@ -28,7 +44,7 @@
/* reset MAC to disable all RX/TX */
atl1e_reset_hw(&adapter->hw);
-@@ -2257,8 +2263,10 @@ static const struct net_device_ops atl1e
+@@ -2265,8 +2273,10 @@ static const struct net_device_ops atl1e
.ndo_set_rx_mode = atl1e_set_multi,
.ndo_validate_addr = eth_validate_addr,
.ndo_set_mac_address = atl1e_set_mac_addr,
@@ -39,7 +55,7 @@
.ndo_change_mtu = atl1e_change_mtu,
.ndo_do_ioctl = atl1e_ioctl,
.ndo_tx_timeout = atl1e_tx_timeout,
-@@ -2278,12 +2286,17 @@ static int atl1e_init_netdev(struct net_
+@@ -2286,12 +2296,17 @@ static int atl1e_init_netdev(struct net_
netdev->watchdog_timeo = AT_TX_WATCHDOG;
atl1e_set_ethtool_ops(netdev);
--
1.7.10.4
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 15/16] backports: fix unused hidp_get_raw_report() warning
2014-01-19 16:47 [PATCH 00/16] backports: bring to next-20140117 Hauke Mehrtens
` (13 preceding siblings ...)
2014-01-19 16:47 ` [PATCH 14/16] backports: fix unused atl1e_rx_mode() warning Hauke Mehrtens
@ 2014-01-19 16:47 ` Hauke Mehrtens
2014-01-19 16:47 ` [PATCH 16/16] backports: refresh on next-20140117 Hauke Mehrtens
15 siblings, 0 replies; 18+ messages in thread
From: Hauke Mehrtens @ 2014-01-19 16:47 UTC (permalink / raw
To: mcgrof; +Cc: backports, Hauke Mehrtens
This fixes the following warning:
/net/bluetooth/hidp/core.c:271:12: warning: ‘hidp_get_raw_report’ defined but not used [-Wunused-function]
static int hidp_get_raw_report(struct hid_device *hid,
^
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
.../16-bluetooth/net_bluetooth_hidp_core.patch | 22 ++++++++++++++------
1 file changed, 16 insertions(+), 6 deletions(-)
diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hidp_core.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hidp_core.patch
index 4e861f9..29dca32 100644
--- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hidp_core.patch
+++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hidp_core.patch
@@ -1,14 +1,24 @@
--- a/net/bluetooth/hidp/core.c
+++ b/net/bluetooth/hidp/core.c
-@@ -353,6 +353,7 @@ err:
+@@ -268,6 +268,7 @@ static int hidp_hidinput_event(struct in
+ return hidp_send_report(session, field->report);
+ }
+
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,38))
+ static int hidp_get_raw_report(struct hid_device *hid,
+ unsigned char report_number,
+ unsigned char *data, size_t count,
+@@ -352,7 +353,9 @@ err:
+ mutex_unlock(&session->report_mutex);
return ret;
}
++#endif /* (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,38)) */
+#if defined(CPTCFG_BACKPORT_OPTION_BT_SOCK_CREATE_NEEDS_KERN)
static int hidp_output_raw_report(struct hid_device *hid, unsigned char *data, size_t count,
unsigned char report_type)
{
-@@ -410,6 +411,16 @@ err:
+@@ -410,6 +413,16 @@ err:
mutex_unlock(&session->report_mutex);
return ret;
}
@@ -25,7 +35,7 @@
static void hidp_idle_timeout(unsigned long arg)
{
-@@ -698,6 +709,87 @@ static void hidp_close(struct hid_device
+@@ -698,6 +711,87 @@ static void hidp_close(struct hid_device
{
}
@@ -113,7 +123,7 @@
static int hidp_parse(struct hid_device *hid)
{
struct hidp_session *session = hid->driver_data;
-@@ -775,7 +867,9 @@ static int hidp_setup_hid(struct hidp_se
+@@ -775,7 +869,9 @@ static int hidp_setup_hid(struct hidp_se
hid->dev.parent = &session->conn->hcon->dev;
hid->ll_driver = &hidp_hid_driver;
@@ -123,7 +133,7 @@
hid->hid_output_raw_report = hidp_output_raw_report;
/* True if device is blacklisted in drivers/hid/hid-core.c */
-@@ -793,6 +887,7 @@ fault:
+@@ -793,6 +889,7 @@ fault:
return err;
}
@@ -131,7 +141,7 @@
/* initialize session devices */
static int hidp_session_dev_init(struct hidp_session *session,
-@@ -855,10 +950,17 @@ static int hidp_session_dev_add(struct h
+@@ -855,10 +952,17 @@ static int hidp_session_dev_add(struct h
/* remove HID/input devices from their bus systems */
static void hidp_session_dev_del(struct hidp_session *session)
{
--
1.7.10.4
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 16/16] backports: refresh on next-20140117
2014-01-19 16:47 [PATCH 00/16] backports: bring to next-20140117 Hauke Mehrtens
` (14 preceding siblings ...)
2014-01-19 16:47 ` [PATCH 15/16] backports: fix unused hidp_get_raw_report() warning Hauke Mehrtens
@ 2014-01-19 16:47 ` Hauke Mehrtens
15 siblings, 0 replies; 18+ messages in thread
From: Hauke Mehrtens @ 2014-01-19 16:47 UTC (permalink / raw
To: mcgrof; +Cc: backports, Hauke Mehrtens
1 2.6.25 [ OK ]
2 2.6.26 [ OK ]
3 2.6.27 [ OK ]
4 2.6.28 [ OK ]
5 2.6.29 [ OK ]
6 2.6.30 [ OK ]
7 2.6.31 [ OK ]
8 2.6.32 [ OK ]
9 2.6.33 [ OK ]
10 2.6.34 [ OK ]
11 2.6.35 [ OK ]
12 2.6.36 [ OK ]
13 2.6.37 [ OK ]
14 2.6.38 [ OK ]
15 2.6.39 [ OK ]
16 3.0.101 [ OK ]
17 3.1.10 [ OK ]
18 3.2.54 [ OK ]
19 3.3.8 [ OK ]
20 3.4.77 [ OK ]
21 3.5.7 [ OK ]
22 3.6.11 [ OK ]
23 3.7.10 [ OK ]
24 3.8.13 [ OK ]
25 3.9.11 [ OK ]
26 3.10.27 [ OK ]
27 3.11.10 [ OK ]
28 3.12.8 [ OK ]
29 3.13-rc8 [ OK ]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
patches/collateral-evolutions/media/0004-sysfs-api.patch | 6 +++---
.../0003-netdev-needed_headroom_tailroom/mac80211.patch | 4 ++--
.../network/0006-disable-dump-adjust-on-old-kernels.patch | 4 ++--
.../09-threaded-irq/drivers_net_wireless_b43_main.patch | 6 +++---
.../drivers_net_wireless_iwlwifi_pcie_trans.patch | 4 ++--
.../09-threaded-irq/drivers_net_wireless_ti_wlcore_main.patch | 6 +++---
.../12-mac80211-disable-tx-status/net_mac80211_tx.patch | 4 ++--
.../network/16-bluetooth/net_bluetooth_l2cap_sock.patch | 6 +++---
.../network/16-bluetooth/net_bluetooth_rfcomm_sock.patch | 2 +-
.../network/16-bluetooth/net_bluetooth_rfcomm_tty.patch | 8 ++++----
.../network/17-netdev-queue/net_mac80211_iface.patch | 4 ++--
.../network/22-multiqueue/net_mac80211_tx.patch | 2 +-
.../network/25-multicast-list_head/include_net_mac80211.patch | 2 +-
.../network/30-bridge-port/net_wireless_nl80211.patch | 2 +-
.../network/37-vsnprintk/drivers_net_wireless_ath_main.patch | 6 +++---
.../drivers_net_ethernet_atheros_alx_main.patch | 4 ++--
.../drivers_net_ethernet_atheros_atl1c_atl1c_main.patch | 6 +++---
.../drivers_net_ethernet_atheros_atlx_atl1.patch | 8 ++++----
.../network/42-netlink_seq/net_wireless_nl80211.patch | 2 +-
.../drivers_net_wireless_b43_main.patch | 2 +-
.../drivers_net_ethernet_atheros_atl1c_atl1c_main.patch | 2 +-
.../drivers_net_ethernet_atheros_atlx_atl1.patch | 2 +-
.../network/63-tty-termios/net_bluetooth_rfcomm_tty.patch | 2 +-
.../network/69-wowlan-no-socket/net_wireless_nl80211.patch | 2 +-
.../network/76-sysfs-api/drivers_ssb.patch | 2 +-
.../collateral-evolutions/network/81-genl-const/hwsim.patch | 2 +-
.../collateral-evolutions/network/81-genl-const/nl80211.patch | 6 +++---
27 files changed, 53 insertions(+), 53 deletions(-)
diff --git a/patches/collateral-evolutions/media/0004-sysfs-api.patch b/patches/collateral-evolutions/media/0004-sysfs-api.patch
index fd22975..23c445d 100644
--- a/patches/collateral-evolutions/media/0004-sysfs-api.patch
+++ b/patches/collateral-evolutions/media/0004-sysfs-api.patch
@@ -1,6 +1,6 @@
--- a/drivers/media/v4l2-core/v4l2-dev.c
+++ b/drivers/media/v4l2-core/v4l2-dev.c
-@@ -90,7 +90,12 @@ static struct attribute *video_device_at
+@@ -86,7 +86,12 @@ static struct attribute *video_device_at
&dev_attr_index.attr,
NULL,
};
@@ -13,7 +13,7 @@
/*
* Active devices
-@@ -225,7 +230,11 @@ static void v4l2_device_release(struct d
+@@ -221,7 +226,11 @@ static void v4l2_device_release(struct d
static struct class video_class = {
.name = VIDEO_NAME,
@@ -25,7 +25,7 @@
};
struct video_device *video_devdata(struct file *file)
-@@ -999,6 +1008,7 @@ static int __init videodev_init(void)
+@@ -990,6 +999,7 @@ static int __init videodev_init(void)
return ret;
}
diff --git a/patches/collateral-evolutions/network/0003-netdev-needed_headroom_tailroom/mac80211.patch b/patches/collateral-evolutions/network/0003-netdev-needed_headroom_tailroom/mac80211.patch
index 2b3ae36..e7995a6 100644
--- a/patches/collateral-evolutions/network/0003-netdev-needed_headroom_tailroom/mac80211.patch
+++ b/patches/collateral-evolutions/network/0003-netdev-needed_headroom_tailroom/mac80211.patch
@@ -1,6 +1,6 @@
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
-@@ -1596,6 +1596,7 @@ int ieee80211_if_add(struct ieee80211_lo
+@@ -1598,6 +1598,7 @@ int ieee80211_if_add(struct ieee80211_lo
return -ENOMEM;
dev_net_set(ndev, wiphy_net(local->hw.wiphy));
@@ -8,7 +8,7 @@
ndev->needed_headroom = local->tx_headroom +
4*6 /* four MAC addresses */
+ 2 + 2 + 2 + 2 /* ctl, dur, seq, qos */
-@@ -1604,6 +1605,7 @@ int ieee80211_if_add(struct ieee80211_lo
+@@ -1606,6 +1607,7 @@ int ieee80211_if_add(struct ieee80211_lo
- ETH_HLEN /* ethernet hard_header_len */
+ IEEE80211_ENCRYPT_HEADROOM;
ndev->needed_tailroom = IEEE80211_ENCRYPT_TAILROOM;
diff --git a/patches/collateral-evolutions/network/0006-disable-dump-adjust-on-old-kernels.patch b/patches/collateral-evolutions/network/0006-disable-dump-adjust-on-old-kernels.patch
index 46728b2..55a086b 100644
--- a/patches/collateral-evolutions/network/0006-disable-dump-adjust-on-old-kernels.patch
+++ b/patches/collateral-evolutions/network/0006-disable-dump-adjust-on-old-kernels.patch
@@ -28,7 +28,7 @@ Date: Fri Mar 1 14:03:49 2013 +0100
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
-@@ -1708,6 +1708,7 @@ static int nl80211_dump_wiphy(struct sk_
+@@ -1705,6 +1705,7 @@ static int nl80211_dump_wiphy(struct sk_
cb->nlh->nlmsg_seq,
NLM_F_MULTI, state);
if (ret < 0) {
@@ -36,7 +36,7 @@ Date: Fri Mar 1 14:03:49 2013 +0100
/*
* If sending the wiphy data didn't fit (ENOBUFS
* or EMSGSIZE returned), this SKB is still
-@@ -1728,6 +1729,7 @@ static int nl80211_dump_wiphy(struct sk_
+@@ -1725,6 +1726,7 @@ static int nl80211_dump_wiphy(struct sk_
rtnl_unlock();
return 1;
}
diff --git a/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_b43_main.patch b/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_b43_main.patch
index 3d364d8..d8c85d4 100644
--- a/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_b43_main.patch
+++ b/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_b43_main.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
-@@ -4238,8 +4238,13 @@ redo:
+@@ -4243,8 +4243,13 @@ redo:
if (b43_bus_host_is_sdio(dev->dev)) {
b43_sdio_free_irq(dev);
} else {
@@ -14,7 +14,7 @@
}
mutex_lock(&wl->mutex);
dev = wl->current_dev;
-@@ -4285,9 +4290,17 @@ static int b43_wireless_core_start(struc
+@@ -4290,9 +4295,17 @@ static int b43_wireless_core_start(struc
goto out;
}
} else {
@@ -32,7 +32,7 @@
if (err) {
b43err(dev->wl, "Cannot request IRQ-%d\n",
dev->dev->irq);
-@@ -5124,6 +5137,10 @@ static int b43_setup_bands(struct b43_wl
+@@ -5123,6 +5136,10 @@ static int b43_setup_bands(struct b43_wl
static void b43_wireless_core_detach(struct b43_wldev *dev)
{
diff --git a/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_iwlwifi_pcie_trans.patch b/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_iwlwifi_pcie_trans.patch
index 69a1c86..8067684 100644
--- a/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_iwlwifi_pcie_trans.patch
+++ b/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_iwlwifi_pcie_trans.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
-@@ -878,12 +878,21 @@ void iwl_trans_pcie_free(struct iwl_tran
+@@ -900,12 +900,21 @@ void iwl_trans_pcie_free(struct iwl_tran
{
struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
@@ -22,7 +22,7 @@
iwl_pcie_free_ict(trans);
pci_disable_msi(trans_pcie->pci_dev);
-@@ -1584,9 +1593,16 @@ struct iwl_trans *iwl_trans_pcie_alloc(s
+@@ -1606,9 +1615,16 @@ struct iwl_trans *iwl_trans_pcie_alloc(s
if (iwl_pcie_alloc_ict(trans))
goto out_free_cmd_pool;
diff --git a/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_ti_wlcore_main.patch b/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_ti_wlcore_main.patch
index 9d4cb79..9381b59 100644
--- a/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_ti_wlcore_main.patch
+++ b/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_ti_wlcore_main.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/ti/wlcore/main.c
+++ b/drivers/net/wireless/ti/wlcore/main.c
-@@ -6064,15 +6064,27 @@ static void wlcore_nvs_cb(const struct f
+@@ -6073,15 +6073,27 @@ static void wlcore_nvs_cb(const struct f
wl->platform_quirks = pdata->platform_quirks;
wl->if_ops = pdev_data->if_ops;
@@ -28,7 +28,7 @@
if (ret < 0) {
wl1271_error("request_irq() failed: %d", ret);
goto out_free_nvs;
-@@ -6118,7 +6130,11 @@ out_unreg:
+@@ -6127,7 +6139,11 @@ out_unreg:
wl1271_unregister_hw(wl);
out_irq:
@@ -40,7 +40,7 @@
out_free_nvs:
kfree(wl->nvs);
-@@ -6164,7 +6180,12 @@ int wlcore_remove(struct platform_device
+@@ -6173,7 +6189,12 @@ int wlcore_remove(struct platform_device
disable_irq_wake(wl->irq);
}
wl1271_unregister_hw(wl);
diff --git a/patches/collateral-evolutions/network/12-mac80211-disable-tx-status/net_mac80211_tx.patch b/patches/collateral-evolutions/network/12-mac80211-disable-tx-status/net_mac80211_tx.patch
index ebfbf16..1e10d38 100644
--- a/patches/collateral-evolutions/network/12-mac80211-disable-tx-status/net_mac80211_tx.patch
+++ b/patches/collateral-evolutions/network/12-mac80211-disable-tx-status/net_mac80211_tx.patch
@@ -1,6 +1,6 @@
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
-@@ -2049,6 +2049,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s
+@@ -2054,6 +2054,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s
goto fail_rcu;
}
@@ -8,7 +8,7 @@
if (unlikely(!multicast && skb->sk &&
skb_shinfo(skb)->tx_flags & SKBTX_WIFI_STATUS)) {
struct sk_buff *orig_skb = skb;
-@@ -2077,6 +2078,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s
+@@ -2082,6 +2083,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s
skb = orig_skb;
}
}
diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_l2cap_sock.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_l2cap_sock.patch
index fb4e8cb..d0959db 100644
--- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_l2cap_sock.patch
+++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_l2cap_sock.patch
@@ -1,6 +1,6 @@
--- a/net/bluetooth/l2cap_sock.c
+++ b/net/bluetooth/l2cap_sock.c
-@@ -723,8 +723,13 @@ static int l2cap_sock_setsockopt_old(str
+@@ -736,8 +736,13 @@ static int l2cap_sock_setsockopt_old(str
return err;
}
@@ -14,7 +14,7 @@
{
struct sock *sk = sock->sk;
struct l2cap_chan *chan = l2cap_pi(sk)->chan;
-@@ -1521,8 +1526,12 @@ static struct sock *l2cap_sock_alloc(str
+@@ -1534,8 +1539,12 @@ static struct sock *l2cap_sock_alloc(str
return sk;
}
@@ -27,7 +27,7 @@
{
struct sock *sk;
-@@ -1534,7 +1543,11 @@ static int l2cap_sock_create(struct net
+@@ -1547,7 +1556,11 @@ static int l2cap_sock_create(struct net
sock->type != SOCK_DGRAM && sock->type != SOCK_RAW)
return -ESOCKTNOSUPPORT;
diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_rfcomm_sock.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_rfcomm_sock.patch
index 88c8f31..0ecfca3 100644
--- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_rfcomm_sock.patch
+++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_rfcomm_sock.patch
@@ -14,7 +14,7 @@
{
struct sock *sk;
-@@ -667,7 +672,11 @@ static int rfcomm_sock_setsockopt_old(st
+@@ -672,7 +677,11 @@ static int rfcomm_sock_setsockopt_old(st
return err;
}
diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_rfcomm_tty.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_rfcomm_tty.patch
index 2caf2f3..1013610 100644
--- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_rfcomm_tty.patch
+++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_rfcomm_tty.patch
@@ -1,6 +1,6 @@
--- a/net/bluetooth/rfcomm/tty.c
+++ b/net/bluetooth/rfcomm/tty.c
-@@ -763,7 +763,11 @@ static int rfcomm_tty_write_room(struct
+@@ -796,7 +796,11 @@ static int rfcomm_tty_write_room(struct
return room;
}
@@ -12,8 +12,8 @@
{
BT_DBG("tty %p cmd 0x%02x", tty, cmd);
-@@ -1016,7 +1020,11 @@ static void rfcomm_tty_hangup(struct tty
- tty_port_put(&dev->port);
+@@ -1045,7 +1049,11 @@ static void rfcomm_tty_hangup(struct tty
+ tty_port_hangup(&dev->port);
}
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,38))
@@ -24,7 +24,7 @@
{
struct rfcomm_dev *dev = (struct rfcomm_dev *) tty->driver_data;
-@@ -1025,7 +1033,11 @@ static int rfcomm_tty_tiocmget(struct tt
+@@ -1054,7 +1062,11 @@ static int rfcomm_tty_tiocmget(struct tt
return dev->modem_status;
}
diff --git a/patches/collateral-evolutions/network/17-netdev-queue/net_mac80211_iface.patch b/patches/collateral-evolutions/network/17-netdev-queue/net_mac80211_iface.patch
index fbca21c..06b23fb 100644
--- a/patches/collateral-evolutions/network/17-netdev-queue/net_mac80211_iface.patch
+++ b/patches/collateral-evolutions/network/17-netdev-queue/net_mac80211_iface.patch
@@ -1,6 +1,6 @@
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
-@@ -1720,6 +1720,7 @@ void ieee80211_sdata_stop(struct ieee802
+@@ -1722,6 +1722,7 @@ void ieee80211_sdata_stop(struct ieee802
* Remove all interfaces, may only be called at hardware unregistration
* time because it doesn't do RCU-safe list removals.
*/
@@ -8,7 +8,7 @@
void ieee80211_remove_interfaces(struct ieee80211_local *local)
{
struct ieee80211_sub_if_data *sdata, *tmp;
-@@ -1756,6 +1757,22 @@ void ieee80211_remove_interfaces(struct
+@@ -1758,6 +1759,22 @@ void ieee80211_remove_interfaces(struct
kfree(sdata);
}
}
diff --git a/patches/collateral-evolutions/network/22-multiqueue/net_mac80211_tx.patch b/patches/collateral-evolutions/network/22-multiqueue/net_mac80211_tx.patch
index 23e3c9b..cfb030b 100644
--- a/patches/collateral-evolutions/network/22-multiqueue/net_mac80211_tx.patch
+++ b/patches/collateral-evolutions/network/22-multiqueue/net_mac80211_tx.patch
@@ -1,6 +1,6 @@
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
-@@ -1510,6 +1510,10 @@ void ieee80211_xmit(struct ieee80211_sub
+@@ -1515,6 +1515,10 @@ void ieee80211_xmit(struct ieee80211_sub
}
}
diff --git a/patches/collateral-evolutions/network/25-multicast-list_head/include_net_mac80211.patch b/patches/collateral-evolutions/network/25-multicast-list_head/include_net_mac80211.patch
index 618df66..3f7a360 100644
--- a/patches/collateral-evolutions/network/25-multicast-list_head/include_net_mac80211.patch
+++ b/patches/collateral-evolutions/network/25-multicast-list_head/include_net_mac80211.patch
@@ -1,6 +1,6 @@
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
-@@ -2787,7 +2787,11 @@ struct ieee80211_ops {
+@@ -2789,7 +2789,11 @@ struct ieee80211_ops {
void (*stop_ap)(struct ieee80211_hw *hw, struct ieee80211_vif *vif);
u64 (*prepare_multicast)(struct ieee80211_hw *hw,
diff --git a/patches/collateral-evolutions/network/30-bridge-port/net_wireless_nl80211.patch b/patches/collateral-evolutions/network/30-bridge-port/net_wireless_nl80211.patch
index a4151b8..65a4ddd 100644
--- a/patches/collateral-evolutions/network/30-bridge-port/net_wireless_nl80211.patch
+++ b/patches/collateral-evolutions/network/30-bridge-port/net_wireless_nl80211.patch
@@ -1,6 +1,6 @@
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
-@@ -2407,7 +2407,7 @@ static int nl80211_valid_4addr(struct cf
+@@ -2379,7 +2379,7 @@ static int nl80211_valid_4addr(struct cf
enum nl80211_iftype iftype)
{
if (!use_4addr) {
diff --git a/patches/collateral-evolutions/network/37-vsnprintk/drivers_net_wireless_ath_main.patch b/patches/collateral-evolutions/network/37-vsnprintk/drivers_net_wireless_ath_main.patch
index 2a3d304..b63faee 100644
--- a/patches/collateral-evolutions/network/37-vsnprintk/drivers_net_wireless_ath_main.patch
+++ b/patches/collateral-evolutions/network/37-vsnprintk/drivers_net_wireless_ath_main.patch
@@ -1,14 +1,14 @@
--- a/drivers/net/wireless/ath/main.c
+++ b/drivers/net/wireless/ath/main.c
-@@ -59,6 +59,7 @@ struct sk_buff *ath_rxbuf_alloc(struct a
+@@ -67,6 +67,7 @@ bool ath_is_mybeacon(struct ath_common *
}
- EXPORT_SYMBOL(ath_rxbuf_alloc);
+ EXPORT_SYMBOL(ath_is_mybeacon);
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36))
void ath_printk(const char *level, const struct ath_common* common,
const char *fmt, ...)
{
-@@ -78,4 +79,24 @@ void ath_printk(const char *level, const
+@@ -86,4 +87,24 @@ void ath_printk(const char *level, const
va_end(args);
}
diff --git a/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_alx_main.patch b/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_alx_main.patch
index af38787..e9a4a9e 100644
--- a/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_alx_main.patch
+++ b/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_alx_main.patch
@@ -34,7 +34,7 @@
if (netif_running(netdev))
alx_reinit(alx);
return 0;
-@@ -1176,7 +1188,9 @@ static const struct net_device_ops alx_n
+@@ -1226,7 +1238,9 @@ static const struct net_device_ops alx_n
.ndo_change_mtu = alx_change_mtu,
.ndo_do_ioctl = alx_ioctl,
.ndo_tx_timeout = alx_tx_timeout,
@@ -44,7 +44,7 @@
#ifdef CONFIG_NET_POLL_CONTROLLER
.ndo_poll_controller = alx_poll_controller,
#endif
-@@ -1294,7 +1308,11 @@ static int alx_probe(struct pci_dev *pde
+@@ -1344,7 +1358,11 @@ static int alx_probe(struct pci_dev *pde
}
}
diff --git a/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atl1c_atl1c_main.patch b/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atl1c_atl1c_main.patch
index 641d080..be9c1b8 100644
--- a/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atl1c_atl1c_main.patch
+++ b/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atl1c_atl1c_main.patch
@@ -36,7 +36,7 @@
atl1c_up(adapter);
clear_bit(__AT_RESETTING, &adapter->flags);
}
-@@ -2495,8 +2508,10 @@ static const struct net_device_ops atl1c
+@@ -2504,8 +2517,10 @@ static const struct net_device_ops atl1c
.ndo_set_mac_address = atl1c_set_mac_addr,
.ndo_set_rx_mode = atl1c_set_multi,
.ndo_change_mtu = atl1c_change_mtu,
@@ -47,7 +47,7 @@
.ndo_do_ioctl = atl1c_ioctl,
.ndo_tx_timeout = atl1c_tx_timeout,
.ndo_get_stats = atl1c_get_stats,
-@@ -2514,6 +2529,7 @@ static int atl1c_init_netdev(struct net_
+@@ -2523,6 +2538,7 @@ static int atl1c_init_netdev(struct net_
netdev->watchdog_timeo = AT_TX_WATCHDOG;
atl1c_set_ethtool_ops(netdev);
@@ -55,7 +55,7 @@
/* TODO: add when ready */
netdev->hw_features = NETIF_F_SG |
NETIF_F_HW_CSUM |
-@@ -2522,6 +2538,14 @@ static int atl1c_init_netdev(struct net_
+@@ -2531,6 +2547,14 @@ static int atl1c_init_netdev(struct net_
NETIF_F_TSO6;
netdev->features = netdev->hw_features |
NETIF_F_HW_VLAN_CTAG_TX;
diff --git a/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atlx_atl1.patch b/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atlx_atl1.patch
index 9d3a16b..894bcc7 100644
--- a/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atlx_atl1.patch
+++ b/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atlx_atl1.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/ethernet/atheros/atlx/atl1.c
+++ b/drivers/net/ethernet/atheros/atlx/atl1.c
-@@ -2909,8 +2909,10 @@ static const struct net_device_ops atl1_
+@@ -2916,8 +2916,10 @@ static const struct net_device_ops atl1_
.ndo_validate_addr = eth_validate_addr,
.ndo_set_mac_address = atl1_set_mac,
.ndo_change_mtu = atl1_change_mtu,
@@ -11,7 +11,7 @@
.ndo_do_ioctl = atlx_ioctl,
.ndo_tx_timeout = atlx_tx_timeout,
#ifdef CONFIG_NET_POLL_CONTROLLER
-@@ -3020,11 +3022,13 @@ static int atl1_probe(struct pci_dev *pd
+@@ -3027,11 +3029,13 @@ static int atl1_probe(struct pci_dev *pd
netdev->features |= NETIF_F_SG;
netdev->features |= (NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX);
@@ -25,7 +25,7 @@
/*
* patch for some L1 of old version,
-@@ -3608,6 +3612,14 @@ static int atl1_set_pauseparam(struct ne
+@@ -3615,6 +3619,14 @@ static int atl1_set_pauseparam(struct ne
return 0;
}
@@ -40,7 +40,7 @@
static void atl1_get_strings(struct net_device *netdev, u32 stringset,
u8 *data)
{
-@@ -3680,6 +3692,12 @@ static const struct ethtool_ops atl1_eth
+@@ -3687,6 +3699,12 @@ static const struct ethtool_ops atl1_eth
.nway_reset = atl1_nway_reset,
.get_ethtool_stats = atl1_get_ethtool_stats,
.get_sset_count = atl1_get_sset_count,
diff --git a/patches/collateral-evolutions/network/42-netlink_seq/net_wireless_nl80211.patch b/patches/collateral-evolutions/network/42-netlink_seq/net_wireless_nl80211.patch
index 3edda0e..cad8792 100644
--- a/patches/collateral-evolutions/network/42-netlink_seq/net_wireless_nl80211.patch
+++ b/patches/collateral-evolutions/network/42-netlink_seq/net_wireless_nl80211.patch
@@ -1,6 +1,6 @@
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
-@@ -6014,7 +6014,9 @@ static int nl80211_dump_scan(struct sk_b
+@@ -5977,7 +5977,9 @@ static int nl80211_dump_scan(struct sk_b
spin_lock_bh(&rdev->bss_lock);
cfg80211_bss_expire(rdev);
diff --git a/patches/collateral-evolutions/network/48-use_skb_get_queue_mapping/drivers_net_wireless_b43_main.patch b/patches/collateral-evolutions/network/48-use_skb_get_queue_mapping/drivers_net_wireless_b43_main.patch
index 850e1a3..0c0e7e7 100644
--- a/patches/collateral-evolutions/network/48-use_skb_get_queue_mapping/drivers_net_wireless_b43_main.patch
+++ b/patches/collateral-evolutions/network/48-use_skb_get_queue_mapping/drivers_net_wireless_b43_main.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
-@@ -3451,11 +3451,11 @@ static void b43_op_tx(struct ieee80211_h
+@@ -3456,11 +3456,11 @@ static void b43_op_tx(struct ieee80211_h
}
B43_WARN_ON(skb_shinfo(skb)->nr_frags);
diff --git a/patches/collateral-evolutions/network/61-netdev-addr_assign_type/drivers_net_ethernet_atheros_atl1c_atl1c_main.patch b/patches/collateral-evolutions/network/61-netdev-addr_assign_type/drivers_net_ethernet_atheros_atl1c_atl1c_main.patch
index d26d40e..34e5951 100644
--- a/patches/collateral-evolutions/network/61-netdev-addr_assign_type/drivers_net_ethernet_atheros_atl1c_atl1c_main.patch
+++ b/patches/collateral-evolutions/network/61-netdev-addr_assign_type/drivers_net_ethernet_atheros_atl1c_atl1c_main.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
+++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
-@@ -2658,7 +2658,9 @@ static int atl1c_probe(struct pci_dev *p
+@@ -2667,7 +2667,9 @@ static int atl1c_probe(struct pci_dev *p
}
if (atl1c_read_mac_addr(&adapter->hw)) {
/* got a random MAC address, set NET_ADDR_RANDOM to netdev */
diff --git a/patches/collateral-evolutions/network/61-netdev-addr_assign_type/drivers_net_ethernet_atheros_atlx_atl1.patch b/patches/collateral-evolutions/network/61-netdev-addr_assign_type/drivers_net_ethernet_atheros_atlx_atl1.patch
index 2584d87..7cdb943 100644
--- a/patches/collateral-evolutions/network/61-netdev-addr_assign_type/drivers_net_ethernet_atheros_atlx_atl1.patch
+++ b/patches/collateral-evolutions/network/61-netdev-addr_assign_type/drivers_net_ethernet_atheros_atlx_atl1.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/ethernet/atheros/atlx/atl1.c
+++ b/drivers/net/ethernet/atheros/atlx/atl1.c
-@@ -3052,7 +3052,9 @@ static int atl1_probe(struct pci_dev *pd
+@@ -3059,7 +3059,9 @@ static int atl1_probe(struct pci_dev *pd
/* copy the MAC address out of the EEPROM */
if (atl1_read_mac_addr(&adapter->hw)) {
/* mark random mac */
diff --git a/patches/collateral-evolutions/network/63-tty-termios/net_bluetooth_rfcomm_tty.patch b/patches/collateral-evolutions/network/63-tty-termios/net_bluetooth_rfcomm_tty.patch
index 992e27f..5905539 100644
--- a/patches/collateral-evolutions/network/63-tty-termios/net_bluetooth_rfcomm_tty.patch
+++ b/patches/collateral-evolutions/network/63-tty-termios/net_bluetooth_rfcomm_tty.patch
@@ -1,6 +1,6 @@
--- a/net/bluetooth/rfcomm/tty.c
+++ b/net/bluetooth/rfcomm/tty.c
-@@ -814,7 +814,11 @@ static int rfcomm_tty_ioctl(struct tty_s
+@@ -847,7 +847,11 @@ static int rfcomm_tty_ioctl(struct tty_s
static void rfcomm_tty_set_termios(struct tty_struct *tty, struct ktermios *old)
{
diff --git a/patches/collateral-evolutions/network/69-wowlan-no-socket/net_wireless_nl80211.patch b/patches/collateral-evolutions/network/69-wowlan-no-socket/net_wireless_nl80211.patch
index 2fd9569..ab511cf 100644
--- a/patches/collateral-evolutions/network/69-wowlan-no-socket/net_wireless_nl80211.patch
+++ b/patches/collateral-evolutions/network/69-wowlan-no-socket/net_wireless_nl80211.patch
@@ -1,6 +1,6 @@
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
-@@ -8239,7 +8239,7 @@ static int nl80211_parse_wowlan_tcp(stru
+@@ -8202,7 +8202,7 @@ static int nl80211_parse_wowlan_tcp(stru
port = nla_get_u16(tb[NL80211_WOWLAN_TCP_SRC_PORT]);
else
port = 0;
diff --git a/patches/collateral-evolutions/network/76-sysfs-api/drivers_ssb.patch b/patches/collateral-evolutions/network/76-sysfs-api/drivers_ssb.patch
index 36a0464..e9b0913 100644
--- a/patches/collateral-evolutions/network/76-sysfs-api/drivers_ssb.patch
+++ b/patches/collateral-evolutions/network/76-sysfs-api/drivers_ssb.patch
@@ -25,7 +25,7 @@
};
static void ssb_buses_lock(void)
-@@ -1461,6 +1470,7 @@ static int __init ssb_modinit(void)
+@@ -1463,6 +1472,7 @@ static int __init ssb_modinit(void)
{
int err;
diff --git a/patches/collateral-evolutions/network/81-genl-const/hwsim.patch b/patches/collateral-evolutions/network/81-genl-const/hwsim.patch
index 4a31f4f..ddb47de 100644
--- a/patches/collateral-evolutions/network/81-genl-const/hwsim.patch
+++ b/patches/collateral-evolutions/network/81-genl-const/hwsim.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
-@@ -2112,7 +2112,7 @@ out:
+@@ -2449,7 +2449,7 @@ static int hwsim_destroy_radio_nl(struct
}
/* Generic Netlink operations array */
diff --git a/patches/collateral-evolutions/network/81-genl-const/nl80211.patch b/patches/collateral-evolutions/network/81-genl-const/nl80211.patch
index 2d9895c..3695e74 100644
--- a/patches/collateral-evolutions/network/81-genl-const/nl80211.patch
+++ b/patches/collateral-evolutions/network/81-genl-const/nl80211.patch
@@ -21,7 +21,7 @@
[NL80211_MCGRP_CONFIG] = { .name = "config", },
[NL80211_MCGRP_SCAN] = { .name = "scan", },
[NL80211_MCGRP_REGULATORY] = { .name = "regulatory", },
-@@ -9190,7 +9190,7 @@ static int nl80211_set_qos_map(struct sk
+@@ -9153,7 +9153,7 @@ static int nl80211_set_qos_map(struct sk
#define NL80211_FLAG_NEED_WDEV_UP (NL80211_FLAG_NEED_WDEV |\
NL80211_FLAG_CHECK_NETDEV_UP)
@@ -30,7 +30,7 @@
struct genl_info *info)
{
struct cfg80211_registered_device *rdev;
-@@ -9259,7 +9259,7 @@ static int nl80211_pre_doit(const struct
+@@ -9222,7 +9222,7 @@ static int nl80211_pre_doit(const struct
return 0;
}
@@ -39,7 +39,7 @@
struct genl_info *info)
{
if (info->user_ptr[1]) {
-@@ -9276,7 +9276,7 @@ static void nl80211_post_doit(const stru
+@@ -9239,7 +9239,7 @@ static void nl80211_post_doit(const stru
rtnl_unlock();
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 18+ messages in thread
* RE: [PATCH 01/16] backports: adapt to changes in netdev select_queue call
2014-01-19 16:47 ` [PATCH 01/16] backports: adapt to changes in netdev select_queue call Hauke Mehrtens
@ 2014-01-19 17:00 ` Grumbach, Emmanuel
0 siblings, 0 replies; 18+ messages in thread
From: Grumbach, Emmanuel @ 2014-01-19 17:00 UTC (permalink / raw
To: Hauke Mehrtens, mcgrof@do-not-panic.com; +Cc: backports@vger.kernel.org
> Subject: [PATCH 01/16] backports: adapt to changes in netdev select_queue
> call
>
> This patch reverts the changes done in the following commit for older kernel
> versions:
> commit f663dd9aaf9ed124f25f0f8452edf238f087ad50
> Author: Jason Wang <jasowang@redhat.com>
> Date: Fri Jan 10 16:18:26 2014 +0800
>
> net: core: explicitly select a txq before doing l2 forwarding
>
> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
> CC: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
This is obviously much better than my version :)
Thanks!
^ permalink raw reply [flat|nested] 18+ messages in thread
end of thread, other threads:[~2014-01-19 17:00 UTC | newest]
Thread overview: 18+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-01-19 16:47 [PATCH 00/16] backports: bring to next-20140117 Hauke Mehrtens
2014-01-19 16:47 ` [PATCH 01/16] backports: adapt to changes in netdev select_queue call Hauke Mehrtens
2014-01-19 17:00 ` Grumbach, Emmanuel
2014-01-19 16:47 ` [PATCH 02/16] backports: add USB_DEVICE_INTERFACE_CLASS Hauke Mehrtens
2014-01-19 16:47 ` [PATCH 03/16] backports: do not activate BCMA_HOST_SOC on kernel < 3.7 Hauke Mehrtens
2014-01-19 16:47 ` [PATCH 04/16] backports: add sdio device id list Hauke Mehrtens
2014-01-19 16:47 ` [PATCH 05/16] backports: add ATTRIBUTE_GROUPS unconditionally Hauke Mehrtens
2014-01-19 16:47 ` [PATCH 06/16] backports: add linux/irqdomain.h Hauke Mehrtens
2014-01-19 16:47 ` [PATCH 07/16] backports: fix header of phy_mii_ioctl() Hauke Mehrtens
2014-01-19 16:47 ` [PATCH 08/16] backports: backport get_stats in alx driver Hauke Mehrtens
2014-01-19 16:47 ` [PATCH 09/16] backports: add IS_BUILTIN() Hauke Mehrtens
2014-01-19 16:47 ` [PATCH 10/16] backports: add prefix infront of ether_addr_equal_{unaligned, 64bits}() Hauke Mehrtens
2014-01-19 16:47 ` [PATCH 11/16] backports: fix led_trigger warning with old kernel versions Hauke Mehrtens
2014-01-19 16:47 ` [PATCH 12/16] backports: fix unused mwifiex_sdio_resume() warning Hauke Mehrtens
2014-01-19 16:47 ` [PATCH 13/16] backports: fix unused var ret warning Hauke Mehrtens
2014-01-19 16:47 ` [PATCH 14/16] backports: fix unused atl1e_rx_mode() warning Hauke Mehrtens
2014-01-19 16:47 ` [PATCH 15/16] backports: fix unused hidp_get_raw_report() warning Hauke Mehrtens
2014-01-19 16:47 ` [PATCH 16/16] backports: refresh on next-20140117 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.