* [PATCH 00/17] backports: bring to next-20131224
@ 2014-01-08 0:34 Hauke Mehrtens
2014-01-08 0:34 ` [PATCH 01/17] backports: add devm_kmalloc() Hauke Mehrtens
` (16 more replies)
0 siblings, 17 replies; 19+ messages in thread
From: Hauke Mehrtens @ 2014-01-08 0:34 UTC (permalink / raw)
To: mcgrof; +Cc: backports, Hauke Mehrtens
This brings backports to next-20131224.
Hauke Mehrtens (17):
backports: add devm_kmalloc()
backports: add netdev_notify_peers()
backports: add ARPHRD_6LOWPAN
backports: add include/trace/events/v4l2.h file
backports: fix number of arguments of phy_connect()
backports: make b44 depend on kernel > 2.6.28
backports: remove usage of members of struct property for kernel <
2.6.39
backports: add include/net/af_ieee802154.h file
backports: remove usage of addr_assign_type in 6lowpan.c
backports: backport multicast list handling in iwlwifi mvm
backports: remove CRC8 backport
backports: add printk_ratelimited()
backports: build some regulator drivers only with recent kernels
backports: copy include/uapi/linux/vsp1.h
backports: fix i2c_add_mux_adapter() parameters
backports: update kernel versions
backports: refresh on next-20131224
backport/backport-include/linux/crc8.h | 109 --------------------
backport/backport-include/linux/device.h | 4 +
backport/backport-include/linux/i2c-mux.h | 11 ++
backport/backport-include/linux/if_arp.h | 4 +
backport/backport-include/linux/netdevice.h | 8 ++
backport/backport-include/linux/phy.h | 11 ++
backport/backport-include/linux/printk.h | 91 ++++++++++++++++
backport/compat/Kconfig | 9 --
backport/compat/Makefile | 1 -
backport/compat/crc8.c | 87 ----------------
copy-list | 3 +
dependencies | 11 +-
devel/backports-update-manager | 12 +--
.../media/0004-sysfs-api.patch | 6 +-
.../mac80211.patch | 4 +-
.../0006-disable-dump-adjust-on-old-kernels.patch | 4 +-
.../include_net_cfg80211.patch | 2 +-
.../net_wireless_core.patch | 2 +-
...rivers_net_wireless_iwlwifi_pcie_internal.patch | 4 +-
.../drivers_net_wireless_iwlwifi_pcie_trans.patch | 4 +-
.../net_wireless_core.patch | 4 +-
.../16-bluetooth/net_bluetooth_hci_sock.patch | 4 +-
.../17-netdev-queue/net_mac80211_iface.patch | 4 +-
.../drivers_net_wireless_iwlwifi.patch | 42 ++++++++
.../drivers_net_wireless_zd1211rw_zd_mac.patch | 2 +-
.../include_net_mac80211.patch | 15 +--
.../net_mac80211_driver-ops.patch | 33 +-----
.../net_mac80211_ieee80211_i.patch | 2 +-
.../net_mac80211_iface.patch | 16 +--
.../25-multicast-list_head/net_mac80211_main.patch | 2 +-
.../30-bridge-port/net_wireless_nl80211.patch | 2 +-
.../network/36-workqueue/net_mac80211_main.patch | 2 +-
...ers_net_ethernet_atheros_atl1c_atl1c_main.patch | 12 +--
.../42-netlink_seq/net_wireless_nl80211.patch | 2 +-
.../54-get_ts_info/drivers_net_usb_usbnet.patch | 2 +-
...ers_net_ethernet_atheros_atl1c_atl1c_main.patch | 2 +-
.../net_bluetooth_6lowpan.patch | 12 +++
.../61-netdev-addr_assign_type/usbnet.patch | 2 +-
.../drivers_net_ethernet_broadcom_b44.patch | 8 +-
.../69-wowlan-no-socket/net_wireless_nl80211.patch | 2 +-
.../drivers_net_wireless_ath_ath9k_debug.patch | 6 +-
.../network/76-sysfs-api/drivers_bcma.patch | 2 +-
.../network/77-led-blink-api/mac80211.patch | 2 +-
.../network/78-usb-sg/usbnet.patch | 12 +--
.../network/81-genl-const/nfc.patch | 4 +-
.../network/81-genl-const/nl80211.patch | 6 +-
.../network/82-struct_property_missing/INFO | 4 +
.../82-struct_property_missing/mwifiex.patch | 28 +++++
48 files changed, 292 insertions(+), 329 deletions(-)
delete mode 100644 backport/backport-include/linux/crc8.h
create mode 100644 backport/backport-include/linux/i2c-mux.h
create mode 100644 backport/backport-include/linux/phy.h
delete mode 100644 backport/compat/crc8.c
create mode 100644 patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_iwlwifi.patch
create mode 100644 patches/collateral-evolutions/network/61-netdev-addr_assign_type/net_bluetooth_6lowpan.patch
create mode 100644 patches/collateral-evolutions/network/82-struct_property_missing/INFO
create mode 100644 patches/collateral-evolutions/network/82-struct_property_missing/mwifiex.patch
--
1.7.10.4
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 01/17] backports: add devm_kmalloc()
2014-01-08 0:34 [PATCH 00/17] backports: bring to next-20131224 Hauke Mehrtens
@ 2014-01-08 0:34 ` Hauke Mehrtens
2014-01-08 0:34 ` [PATCH 02/17] backports: add netdev_notify_peers() Hauke Mehrtens
` (15 subsequent siblings)
16 siblings, 0 replies; 19+ messages in thread
From: Hauke Mehrtens @ 2014-01-08 0:34 UTC (permalink / raw)
To: mcgrof; +Cc: backports, Hauke Mehrtens
devm_kmalloc() was added in kernel 3.13. To backport it we replace the
calls with devm_kzalloc() instead.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
backport/backport-include/linux/device.h | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/backport/backport-include/linux/device.h b/backport/backport-include/linux/device.h
index fa269d2..5eda359 100644
--- a/backport/backport-include/linux/device.h
+++ b/backport/backport-include/linux/device.h
@@ -229,4 +229,8 @@ static inline void *dev_get_platdata(const struct device *dev)
}
#endif
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,13,0)
+#define devm_kmalloc(dev, size, flags) devm_kzalloc(dev, size, flags)
+#endif
+
#endif /* __BACKPORT_DEVICE_H */
--
1.7.10.4
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 02/17] backports: add netdev_notify_peers()
2014-01-08 0:34 [PATCH 00/17] backports: bring to next-20131224 Hauke Mehrtens
2014-01-08 0:34 ` [PATCH 01/17] backports: add devm_kmalloc() Hauke Mehrtens
@ 2014-01-08 0:34 ` Hauke Mehrtens
2014-01-08 0:34 ` [PATCH 03/17] backports: add ARPHRD_6LOWPAN Hauke Mehrtens
` (14 subsequent siblings)
16 siblings, 0 replies; 19+ messages in thread
From: Hauke Mehrtens @ 2014-01-08 0:34 UTC (permalink / raw)
To: mcgrof; +Cc: backports, Hauke Mehrtens
netif_notify_peers() was renamed to netdev_notify_peers() in kernel
3.7. Replace the calls to netdev_notify_peers() with
netif_notify_peers().
Some older kernel versions do not even have netif_notify_peers(), there
we just remove the call, currently it is only used in the 6lowpan code
and I assume it will still work, but not so good.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
backport/backport-include/linux/netdevice.h | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/backport/backport-include/linux/netdevice.h b/backport/backport-include/linux/netdevice.h
index 3d6b7b3..f99ea02 100644
--- a/backport/backport-include/linux/netdevice.h
+++ b/backport/backport-include/linux/netdevice.h
@@ -475,4 +475,12 @@ struct net *dev_net(const struct net_device *dev)
#define netdev_notifier_info_to_dev(ndev) ndev
#endif
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,34) && \
+ LINUX_VERSION_CODE != KERNEL_VERSION(2,6,32)
+/* there is no equivalent function to update arp table */
+#define netdev_notify_peers(dev)
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
+#define netdev_notify_peers(dev) netif_notify_peers(dev)
+#endif
+
#endif /* __BACKPORT_NETDEVICE_H */
--
1.7.10.4
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 03/17] backports: add ARPHRD_6LOWPAN
2014-01-08 0:34 [PATCH 00/17] backports: bring to next-20131224 Hauke Mehrtens
2014-01-08 0:34 ` [PATCH 01/17] backports: add devm_kmalloc() Hauke Mehrtens
2014-01-08 0:34 ` [PATCH 02/17] backports: add netdev_notify_peers() Hauke Mehrtens
@ 2014-01-08 0:34 ` Hauke Mehrtens
2014-01-08 0:34 ` [PATCH 04/17] backports: add include/trace/events/v4l2.h file Hauke Mehrtens
` (13 subsequent siblings)
16 siblings, 0 replies; 19+ messages in thread
From: Hauke Mehrtens @ 2014-01-08 0:34 UTC (permalink / raw)
To: mcgrof; +Cc: backports, Hauke Mehrtens
This adds ARPHRD_6LOWPAN to if_arp.h
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
backport/backport-include/linux/if_arp.h | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/backport/backport-include/linux/if_arp.h b/backport/backport-include/linux/if_arp.h
index dbbea2d..b542423 100644
--- a/backport/backport-include/linux/if_arp.h
+++ b/backport/backport-include/linux/if_arp.h
@@ -7,4 +7,8 @@
#define ARPHRD_IEEE802154_MONITOR 805 /* IEEE 802.15.4 network monitor */
#endif
+#ifndef ARPHRD_6LOWPAN
+#define ARPHRD_6LOWPAN 825 /* IPv6 over LoWPAN */
+#endif
+
#endif /* _BACKPORTS_LINUX_AF_ARP_H */
--
1.7.10.4
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 04/17] backports: add include/trace/events/v4l2.h file
2014-01-08 0:34 [PATCH 00/17] backports: bring to next-20131224 Hauke Mehrtens
` (2 preceding siblings ...)
2014-01-08 0:34 ` [PATCH 03/17] backports: add ARPHRD_6LOWPAN Hauke Mehrtens
@ 2014-01-08 0:34 ` Hauke Mehrtens
2014-01-08 0:34 ` [PATCH 05/17] backports: fix number of arguments of phy_connect() Hauke Mehrtens
` (12 subsequent siblings)
16 siblings, 0 replies; 19+ messages in thread
From: Hauke Mehrtens @ 2014-01-08 0:34 UTC (permalink / raw)
To: mcgrof; +Cc: backports, Hauke Mehrtens
v4l2 now supports tracing and needs a new header file that was missing.
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 9444aff..2a4d56b 100644
--- a/copy-list
+++ b/copy-list
@@ -167,6 +167,7 @@ include/uapi/linux/v4l2-dv-timings.h
include/uapi/linux/v4l2-mediabus.h
include/uapi/linux/v4l2-subdev.h
include/uapi/linux/videodev2.h
+include/trace/events/v4l2.h
drivers/media/
include/linux/platform_data/vsp1.h
--
1.7.10.4
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 05/17] backports: fix number of arguments of phy_connect()
2014-01-08 0:34 [PATCH 00/17] backports: bring to next-20131224 Hauke Mehrtens
` (3 preceding siblings ...)
2014-01-08 0:34 ` [PATCH 04/17] backports: add include/trace/events/v4l2.h file Hauke Mehrtens
@ 2014-01-08 0:34 ` Hauke Mehrtens
2014-01-08 0:34 ` [PATCH 06/17] backports: make b44 depend on kernel > 2.6.28 Hauke Mehrtens
` (11 subsequent siblings)
16 siblings, 0 replies; 19+ messages in thread
From: Hauke Mehrtens @ 2014-01-08 0:34 UTC (permalink / raw)
To: mcgrof; +Cc: backports, Hauke Mehrtens
The flags argument was removed from phy_connect in this commit:
commit f9a8f83b04e0c362a2fc660dbad980d24af209fc
Author: Florian Fainelli <florian@openwrt.org>
Date: Mon Jan 14 00:52:52 2013 +0000
net: phy: remove flags argument from phy_{attach, connect, connect_direct}
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
backport/backport-include/linux/phy.h | 11 +++++++++++
1 file changed, 11 insertions(+)
create mode 100644 backport/backport-include/linux/phy.h
diff --git a/backport/backport-include/linux/phy.h b/backport/backport-include/linux/phy.h
new file mode 100644
index 0000000..4473e4e
--- /dev/null
+++ b/backport/backport-include/linux/phy.h
@@ -0,0 +1,11 @@
+#ifndef __BACKPORT_LINUX_PHY_H
+#define __BACKPORT_LINUX_PHY_H
+#include_next <linux/phy.h>
+#include <linux/version.h>
+
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,9,0))
+#define phy_connect(dev, bus_id, handler, interface) \
+ phy_connect(dev, bus_id, handler, 0, interface)
+#endif
+
+#endif /* __BACKPORT_LINUX_PHY_H */
--
1.7.10.4
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 06/17] backports: make b44 depend on kernel > 2.6.28
2014-01-08 0:34 [PATCH 00/17] backports: bring to next-20131224 Hauke Mehrtens
` (4 preceding siblings ...)
2014-01-08 0:34 ` [PATCH 05/17] backports: fix number of arguments of phy_connect() Hauke Mehrtens
@ 2014-01-08 0:34 ` Hauke Mehrtens
2014-01-08 0:34 ` [PATCH 07/17] backports: remove usage of members of struct property for kernel < 2.6.39 Hauke Mehrtens
` (10 subsequent siblings)
16 siblings, 0 replies; 19+ messages in thread
From: Hauke Mehrtens @ 2014-01-08 0:34 UTC (permalink / raw)
To: mcgrof; +Cc: backports, Hauke Mehrtens
The mdio bus functions where introduced in that version.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
dependencies | 3 +++
1 file changed, 3 insertions(+)
diff --git a/dependencies b/dependencies
index 31de845..e4c1cb7 100644
--- a/dependencies
+++ b/dependencies
@@ -39,6 +39,9 @@ CW1200_WLAN_SPI 2.6.35
BRCMFMAC 2.6.29
+# b44 depends on mdio_bus
+B44 2.6.28
+
WL_TI 2.6.30
WLCORE 2.6.30
# requires irq_modify_status() which was only exported in 3.0
--
1.7.10.4
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 07/17] backports: remove usage of members of struct property for kernel < 2.6.39
2014-01-08 0:34 [PATCH 00/17] backports: bring to next-20131224 Hauke Mehrtens
` (5 preceding siblings ...)
2014-01-08 0:34 ` [PATCH 06/17] backports: make b44 depend on kernel > 2.6.28 Hauke Mehrtens
@ 2014-01-08 0:34 ` Hauke Mehrtens
2014-01-08 0:34 ` [PATCH 08/17] backports: add include/net/af_ieee802154.h file Hauke Mehrtens
` (9 subsequent siblings)
16 siblings, 0 replies; 19+ messages in thread
From: Hauke Mehrtens @ 2014-01-08 0:34 UTC (permalink / raw)
To: mcgrof; +Cc: backports, Hauke Mehrtens
struct property is missing in the general header files in older kernel
versions. There are different versions of this header depending on the
architecture code in use. This removed the access to any members of
struct property for older kernel version when CONFIG_OF is not set.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
.../network/82-struct_property_missing/INFO | 4 +++
.../82-struct_property_missing/mwifiex.patch | 28 ++++++++++++++++++++
2 files changed, 32 insertions(+)
create mode 100644 patches/collateral-evolutions/network/82-struct_property_missing/INFO
create mode 100644 patches/collateral-evolutions/network/82-struct_property_missing/mwifiex.patch
diff --git a/patches/collateral-evolutions/network/82-struct_property_missing/INFO b/patches/collateral-evolutions/network/82-struct_property_missing/INFO
new file mode 100644
index 0000000..b3e0ced
--- /dev/null
+++ b/patches/collateral-evolutions/network/82-struct_property_missing/INFO
@@ -0,0 +1,4 @@
+struct property is missing in the general header files in older kernel
+versions. There are different versions of this header depending on the
+architecture code in use. This removed the access to any members of
+struct property
diff --git a/patches/collateral-evolutions/network/82-struct_property_missing/mwifiex.patch b/patches/collateral-evolutions/network/82-struct_property_missing/mwifiex.patch
new file mode 100644
index 0000000..d3712db
--- /dev/null
+++ b/patches/collateral-evolutions/network/82-struct_property_missing/mwifiex.patch
@@ -0,0 +1,28 @@
+--- a/drivers/net/wireless/mwifiex/sta_cmd.c
++++ b/drivers/net/wireless/mwifiex/sta_cmd.c
+@@ -25,6 +25,7 @@
+ #include "wmm.h"
+ #include "11n.h"
+ #include "11ac.h"
++#include <linux/of.h>
+
+ /*
+ * This function prepares command to set/get RSSI information.
+@@ -1194,6 +1195,7 @@ static int mwifiex_cmd_cfg_data(struct m
+ int ret;
+
+ if (prop) {
++#if defined(CONFIG_OF) || (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39))
+ 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
+ return ret;
+ dev_dbg(adapter->dev,
+ "download cfg_data from device tree: %s\n", prop->name);
++#else
++ return -1;
++#endif
+ } else if (adapter->cal_data->data && adapter->cal_data->size > 0) {
+ len = mwifiex_parse_cal_cfg((u8 *)adapter->cal_data->data,
+ adapter->cal_data->size, data);
--
1.7.10.4
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 08/17] backports: add include/net/af_ieee802154.h file
2014-01-08 0:34 [PATCH 00/17] backports: bring to next-20131224 Hauke Mehrtens
` (6 preceding siblings ...)
2014-01-08 0:34 ` [PATCH 07/17] backports: remove usage of members of struct property for kernel < 2.6.39 Hauke Mehrtens
@ 2014-01-08 0:34 ` Hauke Mehrtens
2014-01-08 0:34 ` [PATCH 09/17] backports: remove usage of addr_assign_type in 6lowpan.c Hauke Mehrtens
` (8 subsequent siblings)
16 siblings, 0 replies; 19+ messages in thread
From: Hauke Mehrtens @ 2014-01-08 0:34 UTC (permalink / raw)
To: mcgrof; +Cc: backports, Hauke Mehrtens
This file was added in kernel 2.6.32 and is now needed by bluetooth.
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 2a4d56b..2b01efb 100644
--- a/copy-list
+++ b/copy-list
@@ -176,6 +176,7 @@ include/linux/platform_data/camera-rcar.h
include/net/nl802154.h
include/net/mac802154.h
include/net/ieee802154.h
+include/net/af_ieee802154.h
include/linux/nl802154.h
include/net/ieee802154_netdev.h
include/net/wpan-phy.h
--
1.7.10.4
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 09/17] backports: remove usage of addr_assign_type in 6lowpan.c
2014-01-08 0:34 [PATCH 00/17] backports: bring to next-20131224 Hauke Mehrtens
` (7 preceding siblings ...)
2014-01-08 0:34 ` [PATCH 08/17] backports: add include/net/af_ieee802154.h file Hauke Mehrtens
@ 2014-01-08 0:34 ` Hauke Mehrtens
2014-01-08 0:34 ` [PATCH 10/17] backports: backport multicast list handling in iwlwifi mvm Hauke Mehrtens
` (7 subsequent siblings)
16 siblings, 0 replies; 19+ messages in thread
From: Hauke Mehrtens @ 2014-01-08 0:34 UTC (permalink / raw)
To: mcgrof; +Cc: backports, Hauke Mehrtens
The bluetooth 6lowpan code now accesses the addr_assign_type member of
struct netdev, which is not available in older kernel versions.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
kernel versions.
---
.../61-netdev-addr_assign_type/net_bluetooth_6lowpan.patch | 12 ++++++++++++
1 file changed, 12 insertions(+)
create mode 100644 patches/collateral-evolutions/network/61-netdev-addr_assign_type/net_bluetooth_6lowpan.patch
diff --git a/patches/collateral-evolutions/network/61-netdev-addr_assign_type/net_bluetooth_6lowpan.patch b/patches/collateral-evolutions/network/61-netdev-addr_assign_type/net_bluetooth_6lowpan.patch
new file mode 100644
index 0000000..ad2618f
--- /dev/null
+++ b/patches/collateral-evolutions/network/61-netdev-addr_assign_type/net_bluetooth_6lowpan.patch
@@ -0,0 +1,12 @@
+--- a/net/bluetooth/6lowpan.c
++++ b/net/bluetooth/6lowpan.c
+@@ -632,7 +632,9 @@ static void set_addr(u8 *eui, u8 *addr,
+ static void set_dev_addr(struct net_device *netdev, bdaddr_t *addr,
+ u8 addr_type)
+ {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)
+ netdev->addr_assign_type = NET_ADDR_PERM;
++#endif
+ set_addr(netdev->dev_addr, addr->b, addr_type);
+ netdev->dev_addr[0] ^= 2;
+ }
--
1.7.10.4
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 10/17] backports: backport multicast list handling in iwlwifi mvm
2014-01-08 0:34 [PATCH 00/17] backports: bring to next-20131224 Hauke Mehrtens
` (8 preceding siblings ...)
2014-01-08 0:34 ` [PATCH 09/17] backports: remove usage of addr_assign_type in 6lowpan.c Hauke Mehrtens
@ 2014-01-08 0:34 ` Hauke Mehrtens
2014-01-08 0:34 ` [PATCH 11/17] backports: remove CRC8 backport Hauke Mehrtens
` (6 subsequent siblings)
16 siblings, 0 replies; 19+ messages in thread
From: Hauke Mehrtens @ 2014-01-08 0:34 UTC (permalink / raw)
To: mcgrof; +Cc: backports, Hauke Mehrtens
From: Johannes Berg <johannes.berg@intel.com>
Backport multicast list handling for kernel < 2.6.35 in iwlwifi mvm
driver.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
.../drivers_net_wireless_iwlwifi.patch | 42 ++++++++++++++++++++
1 file changed, 42 insertions(+)
create mode 100644 patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_iwlwifi.patch
diff --git a/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_iwlwifi.patch b/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_iwlwifi.patch
new file mode 100644
index 0000000..3404c11
--- /dev/null
+++ b/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_iwlwifi.patch
@@ -0,0 +1,42 @@
+--- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c
++++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
+@@ -800,12 +800,21 @@ static void iwl_mvm_recalc_multicast(str
+ }
+
+ static u64 iwl_mvm_prepare_multicast(struct ieee80211_hw *hw,
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
+ struct netdev_hw_addr_list *mc_list)
++#else
++ int addr_count,
++ struct dev_addr_list *mc_list)
++#endif
+ {
+ struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);
+ struct iwl_mcast_filter_cmd *cmd;
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
+ struct netdev_hw_addr *addr;
+ int addr_count = netdev_hw_addr_list_count(mc_list);
++#else
++ struct dev_mc_list *addr;
++#endif
+ bool pass_all = false;
+ int len;
+
+@@ -824,11 +833,15 @@ static u64 iwl_mvm_prepare_multicast(str
+ return (u64)(unsigned long)cmd;
+ }
+
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
+ netdev_hw_addr_list_for_each(addr, mc_list) {
++#else
++ for (addr = mc_list; addr; addr = addr->next) {
++#endif
+ IWL_DEBUG_MAC80211(mvm, "mcast addr (%d): %pM\n",
+- cmd->count, addr->addr);
++ cmd->count, mc_addr(addr));
+ memcpy(&cmd->addr_list[cmd->count * ETH_ALEN],
+- addr->addr, ETH_ALEN);
++ mc_addr(addr), ETH_ALEN);
+ cmd->count++;
+ }
+
--
1.7.10.4
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 11/17] backports: remove CRC8 backport
2014-01-08 0:34 [PATCH 00/17] backports: bring to next-20131224 Hauke Mehrtens
` (9 preceding siblings ...)
2014-01-08 0:34 ` [PATCH 10/17] backports: backport multicast list handling in iwlwifi mvm Hauke Mehrtens
@ 2014-01-08 0:34 ` Hauke Mehrtens
2014-01-08 0:34 ` [PATCH 12/17] backports: add printk_ratelimited() Hauke Mehrtens
` (5 subsequent siblings)
16 siblings, 0 replies; 19+ messages in thread
From: Hauke Mehrtens @ 2014-01-08 0:34 UTC (permalink / raw)
To: mcgrof; +Cc: backports, Hauke Mehrtens
This is not used by any driver any more. brcmsmac was the only driver
selecting this, but did not used it since some months, now it does not
even select it any more.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
backport/backport-include/linux/crc8.h | 109 --------------------------------
backport/compat/Kconfig | 9 ---
backport/compat/Makefile | 1 -
backport/compat/crc8.c | 87 -------------------------
4 files changed, 206 deletions(-)
delete mode 100644 backport/backport-include/linux/crc8.h
delete mode 100644 backport/compat/crc8.c
diff --git a/backport/backport-include/linux/crc8.h b/backport/backport-include/linux/crc8.h
deleted file mode 100644
index 611ba0d..0000000
--- a/backport/backport-include/linux/crc8.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright (c) 2011 Broadcom Corporation
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-#ifndef CPTCFG_BACKPORT_BUILD_CRC8_MODULE
-#include_next <linux/crc8.h>
-#else
-
-#ifndef __CRC8_H_
-#define __CRC8_H_
-
-#include <linux/types.h>
-
-/* see usage of this value in crc8() description */
-#define CRC8_INIT_VALUE 0xFF
-
-/*
- * Return value of crc8() indicating valid message+crc. This is true
- * if a CRC is inverted before transmission. The CRC computed over the
- * whole received bitstream is _table[x], where x is the bit pattern
- * of the modification (almost always 0xff).
- */
-#define CRC8_GOOD_VALUE(_table) (_table[0xFF])
-
-/* required table size for crc8 algorithm */
-#define CRC8_TABLE_SIZE 256
-
-/* helper macro assuring right table size is used */
-#define DECLARE_CRC8_TABLE(_table) \
- static u8 _table[CRC8_TABLE_SIZE]
-
-/**
- * crc8_populate_lsb - fill crc table for given polynomial in regular bit order.
- *
- * @table: table to be filled.
- * @polynomial: polynomial for which table is to be filled.
- *
- * This function fills the provided table according the polynomial provided for
- * regular bit order (lsb first). Polynomials in CRC algorithms are typically
- * represented as shown below.
- *
- * poly = x^8 + x^7 + x^6 + x^4 + x^2 + 1
- *
- * For lsb first direction x^7 maps to the lsb. So the polynomial is as below.
- *
- * - lsb first: poly = 10101011(1) = 0xAB
- */
-#define crc8_populate_lsb LINUX_BACKPORT(crc8_populate_lsb)
-void crc8_populate_lsb(u8 table[CRC8_TABLE_SIZE], u8 polynomial);
-
-/**
- * crc8_populate_msb - fill crc table for given polynomial in reverse bit order.
- *
- * @table: table to be filled.
- * @polynomial: polynomial for which table is to be filled.
- *
- * This function fills the provided table according the polynomial provided for
- * reverse bit order (msb first). Polynomials in CRC algorithms are typically
- * represented as shown below.
- *
- * poly = x^8 + x^7 + x^6 + x^4 + x^2 + 1
- *
- * For msb first direction x^7 maps to the msb. So the polynomial is as below.
- *
- * - msb first: poly = (1)11010101 = 0xD5
- */
-#define crc8_populate_msb LINUX_BACKPORT(crc8_populate_msb)
-void crc8_populate_msb(u8 table[CRC8_TABLE_SIZE], u8 polynomial);
-
-/**
- * crc8() - calculate a crc8 over the given input data.
- *
- * @table: crc table used for calculation.
- * @pdata: pointer to data buffer.
- * @nbytes: number of bytes in data buffer.
- * @crc: previous returned crc8 value.
- *
- * The CRC8 is calculated using the polynomial given in crc8_populate_msb()
- * or crc8_populate_lsb().
- *
- * The caller provides the initial value (either %CRC8_INIT_VALUE
- * or the previous returned value) to allow for processing of
- * discontiguous blocks of data. When generating the CRC the
- * caller is responsible for complementing the final return value
- * and inserting it into the byte stream. When validating a byte
- * stream (including CRC8), a final return value of %CRC8_GOOD_VALUE
- * indicates the byte stream data can be considered valid.
- *
- * Reference:
- * "A Painless Guide to CRC Error Detection Algorithms", ver 3, Aug 1993
- * Williams, Ross N., ross<at>ross.net
- * (see URL http://www.ross.net/crc/download/crc_v3.txt).
- */
-#define crc8 LINUX_BACKPORT(crc8)
-u8 crc8(const u8 table[CRC8_TABLE_SIZE], u8 *pdata, size_t nbytes, u8 crc);
-
-#endif /* __CRC8_H_ */
-#endif /* BACKPORT_BUILD_CRC8_MODULE */
diff --git a/backport/compat/Kconfig b/backport/compat/Kconfig
index c3e9a04..2dda9ac 100644
--- a/backport/compat/Kconfig
+++ b/backport/compat/Kconfig
@@ -93,15 +93,6 @@ config BACKPORT_BUILD_CORDIC
config BACKPORT_CORDIC
bool
-config BACKPORT_BUILD_CRC8
- tristate
- depends on !CRC8
- default m if BACKPORT_CRC8
- default m if BACKPORT_USERSEL_BUILD_ALL
-
-config BACKPORT_CRC8
- bool
-
config BACKPORT_BUILD_GENERIC_ATOMIC64
bool
default y if !64BIT && !GENERIC_ATOMIC64
diff --git a/backport/compat/Makefile b/backport/compat/Makefile
index dbf2bff..94eda5f 100644
--- a/backport/compat/Makefile
+++ b/backport/compat/Makefile
@@ -10,7 +10,6 @@ sch_fq_codel-y = sch_fq_codel_core.o flow_dissector.o
obj-$(CPTCFG_BACKPORT_USERSEL_NET_SCH_FQ_CODEL) += sch_fq_codel.o
obj-$(CPTCFG_BACKPORT_BUILD_CORDIC) += cordic.o
-obj-$(CPTCFG_BACKPORT_BUILD_CRC8) += crc8.o
# Compat kernel compatibility code
compat-$(CPTCFG_BACKPORT_KERNEL_2_6_26) += compat-2.6.26.o
diff --git a/backport/compat/crc8.c b/backport/compat/crc8.c
deleted file mode 100644
index 5878171..0000000
--- a/backport/compat/crc8.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (c) 2011 Broadcom Corporation
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#undef pr_fmt
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/module.h>
-#include <linux/crc8.h>
-#include <linux/printk.h>
-
-/*
- * crc8_populate_msb - fill crc table for given polynomial in reverse bit order.
- *
- * table: table to be filled.
- * polynomial: polynomial for which table is to be filled.
- */
-void crc8_populate_msb(u8 table[CRC8_TABLE_SIZE], u8 polynomial)
-{
- int i, j;
- const u8 msbit = 0x80;
- u8 t = msbit;
-
- table[0] = 0;
-
- for (i = 1; i < CRC8_TABLE_SIZE; i *= 2) {
- t = (t << 1) ^ (t & msbit ? polynomial : 0);
- for (j = 0; j < i; j++)
- table[i+j] = table[j] ^ t;
- }
-}
-EXPORT_SYMBOL_GPL(crc8_populate_msb);
-
-/*
- * crc8_populate_lsb - fill crc table for given polynomial in regular bit order.
- *
- * table: table to be filled.
- * polynomial: polynomial for which table is to be filled.
- */
-void crc8_populate_lsb(u8 table[CRC8_TABLE_SIZE], u8 polynomial)
-{
- int i, j;
- u8 t = 1;
-
- table[0] = 0;
-
- for (i = (CRC8_TABLE_SIZE >> 1); i; i >>= 1) {
- t = (t >> 1) ^ (t & 1 ? polynomial : 0);
- for (j = 0; j < CRC8_TABLE_SIZE; j += 2*i)
- table[i+j] = table[j] ^ t;
- }
-}
-EXPORT_SYMBOL_GPL(crc8_populate_lsb);
-
-/*
- * crc8 - calculate a crc8 over the given input data.
- *
- * table: crc table used for calculation.
- * pdata: pointer to data buffer.
- * nbytes: number of bytes in data buffer.
- * crc: previous returned crc8 value.
- */
-u8 crc8(const u8 table[CRC8_TABLE_SIZE], u8 *pdata, size_t nbytes, u8 crc)
-{
- /* loop over the buffer data */
- while (nbytes-- > 0)
- crc = table[(crc ^ *pdata++) & 0xff];
-
- return crc;
-}
-EXPORT_SYMBOL_GPL(crc8);
-
-MODULE_DESCRIPTION("CRC8 (by Williams, Ross N.) function");
-MODULE_AUTHOR("Broadcom Corporation");
-MODULE_LICENSE("Dual BSD/GPL");
--
1.7.10.4
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 12/17] backports: add printk_ratelimited()
2014-01-08 0:34 [PATCH 00/17] backports: bring to next-20131224 Hauke Mehrtens
` (10 preceding siblings ...)
2014-01-08 0:34 ` [PATCH 11/17] backports: remove CRC8 backport Hauke Mehrtens
@ 2014-01-08 0:34 ` Hauke Mehrtens
2014-01-08 0:34 ` [PATCH 13/17] backports: build some regulator drivers only with recent kernels Hauke Mehrtens
` (4 subsequent siblings)
16 siblings, 0 replies; 19+ messages in thread
From: Hauke Mehrtens @ 2014-01-08 0:34 UTC (permalink / raw)
To: mcgrof; +Cc: backports, Hauke Mehrtens
This adds the backport for some printk_ratelimited() functions.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
backport/backport-include/linux/printk.h | 91 ++++++++++++++++++++++++++++++
1 file changed, 91 insertions(+)
diff --git a/backport/backport-include/linux/printk.h b/backport/backport-include/linux/printk.h
index 6bc9931..ff7140b 100644
--- a/backport/backport-include/linux/printk.h
+++ b/backport/backport-include/linux/printk.h
@@ -97,6 +97,97 @@ static inline __attribute__ ((format (printf, 1, 2)))
int no_printk(const char *s, ...) { return 0; }
#endif
+#ifndef printk_ratelimited
+/*
+ * ratelimited messages with local ratelimit_state,
+ * no local ratelimit_state used in the !PRINTK case
+ */
+#ifdef CONFIG_PRINTK
+#define printk_ratelimited(fmt, ...) \
+({ \
+ static DEFINE_RATELIMIT_STATE(_rs, \
+ DEFAULT_RATELIMIT_INTERVAL, \
+ DEFAULT_RATELIMIT_BURST); \
+ \
+ if (__ratelimit(&_rs)) \
+ printk(fmt, ##__VA_ARGS__); \
+})
+#else
+#define printk_ratelimited(fmt, ...) \
+ no_printk(fmt, ##__VA_ARGS__)
+#endif
+#endif /* printk_ratelimited */
+
+#ifndef pr_emerg_ratelimited
+#define pr_emerg_ratelimited(fmt, ...) \
+ printk_ratelimited(KERN_EMERG pr_fmt(fmt), ##__VA_ARGS__)
+#endif /* pr_emerg_ratelimited */
+
+#ifndef pr_alert_ratelimited
+#define pr_alert_ratelimited(fmt, ...) \
+ printk_ratelimited(KERN_ALERT pr_fmt(fmt), ##__VA_ARGS__)
+#endif /* pr_alert_ratelimited */
+
+#ifndef pr_crit_ratelimited
+#define pr_crit_ratelimited(fmt, ...) \
+ printk_ratelimited(KERN_CRIT pr_fmt(fmt), ##__VA_ARGS__)
+#endif /* pr_crit_ratelimited */
+
+#ifndef pr_err_ratelimited
+#define pr_err_ratelimited(fmt, ...) \
+ printk_ratelimited(KERN_ERR pr_fmt(fmt), ##__VA_ARGS__)
+#endif /* pr_err_ratelimited */
+
+#ifndef pr_warn_ratelimited
+#define pr_warn_ratelimited(fmt, ...) \
+ printk_ratelimited(KERN_WARNING pr_fmt(fmt), ##__VA_ARGS__)
+#endif /* pr_warn_ratelimited */
+
+#ifndef pr_notice_ratelimited
+#define pr_notice_ratelimited(fmt, ...) \
+ printk_ratelimited(KERN_NOTICE pr_fmt(fmt), ##__VA_ARGS__)
+#endif /* pr_notice_ratelimited */
+
+#ifndef pr_info_ratelimited
+#define pr_info_ratelimited(fmt, ...) \
+ printk_ratelimited(KERN_INFO pr_fmt(fmt), ##__VA_ARGS__)
+#endif /* pr_info_ratelimited */
+
+/* no pr_cont_ratelimited, don't do that... */
+
+#ifndef pr_devel_ratelimited
+#if defined(DEBUG)
+#define pr_devel_ratelimited(fmt, ...) \
+ printk_ratelimited(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__)
+#else
+#define pr_devel_ratelimited(fmt, ...) \
+ no_printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__)
+#endif
+#endif /* pr_devel_ratelimited */
+
+#ifndef pr_debug_ratelimited
+/* If you are writing a driver, please use dev_dbg instead */
+#if defined(CONFIG_DYNAMIC_DEBUG)
+/* descriptor check is first to prevent flooding with "callbacks suppressed" */
+#define pr_debug_ratelimited(fmt, ...) \
+do { \
+ static DEFINE_RATELIMIT_STATE(_rs, \
+ DEFAULT_RATELIMIT_INTERVAL, \
+ DEFAULT_RATELIMIT_BURST); \
+ DEFINE_DYNAMIC_DEBUG_METADATA(descriptor, fmt); \
+ if (unlikely(descriptor.flags & _DPRINTK_FLAGS_PRINT) && \
+ __ratelimit(&_rs)) \
+ __dynamic_pr_debug(&descriptor, fmt, ##__VA_ARGS__); \
+} while (0)
+#elif defined(DEBUG)
+#define pr_debug_ratelimited(fmt, ...) \
+ printk_ratelimited(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__)
+#else
+#define pr_debug_ratelimited(fmt, ...) \
+ no_printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__)
+#endif
+#endif /* pr_debug_ratelimited */
+
#endif /* _COMPAT_LINUX_PRINTK_H */
/* This must be outside -- see also kernel.h */
--
1.7.10.4
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 13/17] backports: build some regulator drivers only with recent kernels
2014-01-08 0:34 [PATCH 00/17] backports: bring to next-20131224 Hauke Mehrtens
` (11 preceding siblings ...)
2014-01-08 0:34 ` [PATCH 12/17] backports: add printk_ratelimited() Hauke Mehrtens
@ 2014-01-08 0:34 ` Hauke Mehrtens
2014-01-08 0:34 ` [PATCH 14/17] backports: copy include/uapi/linux/vsp1.h Hauke Mehrtens
` (3 subsequent siblings)
16 siblings, 0 replies; 19+ messages in thread
From: Hauke Mehrtens @ 2014-01-08 0:34 UTC (permalink / raw)
To: mcgrof; +Cc: backports, Hauke Mehrtens
When these drivers are build with older kernel versions we get build
errors.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
dependencies | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/dependencies b/dependencies
index e4c1cb7..bd577c2 100644
--- a/dependencies
+++ b/dependencies
@@ -91,8 +91,8 @@ REGULATOR_PCAP 3.6
REGULATOR_PCF50633 3.8
REGULATOR_PFUZE100 3.6
REGULATOR_RC5T583 3.6
-REGULATOR_S2MPS11 3.12
-REGULATOR_S5M8767 3.9
+REGULATOR_S2MPS11 3.13
+REGULATOR_S5M8767 3.14
REGULATOR_TPS51632 3.8
REGULATOR_TPS6105X 3.6
REGULATOR_TPS62360 3.6
@@ -102,8 +102,8 @@ REGULATOR_TPS6507X 3.6
REGULATOR_TPS65090 3.9
REGULATOR_TPS65217 3.12
REGULATOR_TPS6524X 3.6
-REGULATOR_TPS6586X 3.9
-REGULATOR_TPS65910 3.6
+REGULATOR_TPS6586X 3.14
+REGULATOR_TPS65910 3.14
REGULATOR_TPS65912 3.12
REGULATOR_TWL4030 3.11
REGULATOR_WM831X 3.12
--
1.7.10.4
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 14/17] backports: copy include/uapi/linux/vsp1.h
2014-01-08 0:34 [PATCH 00/17] backports: bring to next-20131224 Hauke Mehrtens
` (12 preceding siblings ...)
2014-01-08 0:34 ` [PATCH 13/17] backports: build some regulator drivers only with recent kernels Hauke Mehrtens
@ 2014-01-08 0:34 ` Hauke Mehrtens
2014-01-08 0:34 ` [PATCH 15/17] backports: fix i2c_add_mux_adapter() parameters Hauke Mehrtens
` (2 subsequent siblings)
16 siblings, 0 replies; 19+ messages in thread
From: Hauke Mehrtens @ 2014-01-08 0:34 UTC (permalink / raw)
To: mcgrof; +Cc: backports, Hauke Mehrtens
This header file is now needed by a media driver.
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 2b01efb..9ec4f4b 100644
--- a/copy-list
+++ b/copy-list
@@ -167,6 +167,7 @@ include/uapi/linux/v4l2-dv-timings.h
include/uapi/linux/v4l2-mediabus.h
include/uapi/linux/v4l2-subdev.h
include/uapi/linux/videodev2.h
+include/uapi/linux/vsp1.h
include/trace/events/v4l2.h
drivers/media/
--
1.7.10.4
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 15/17] backports: fix i2c_add_mux_adapter() parameters
2014-01-08 0:34 [PATCH 00/17] backports: bring to next-20131224 Hauke Mehrtens
` (13 preceding siblings ...)
2014-01-08 0:34 ` [PATCH 14/17] backports: copy include/uapi/linux/vsp1.h Hauke Mehrtens
@ 2014-01-08 0:34 ` Hauke Mehrtens
2014-01-08 0:34 ` [PATCH 16/17] backports: update kernel versions Hauke Mehrtens
2014-01-08 0:34 ` [PATCH 17/17] backports: refresh on next-20131224 Hauke Mehrtens
16 siblings, 0 replies; 19+ messages in thread
From: Hauke Mehrtens @ 2014-01-08 0:34 UTC (permalink / raw)
To: mcgrof; +Cc: backports, Hauke Mehrtens
The class parameter was added in kernel 3.7 to i2c_add_mux_adapter()
and could just be ignored by older kernel versions.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
backport/backport-include/linux/i2c-mux.h | 11 +++++++++++
1 file changed, 11 insertions(+)
create mode 100644 backport/backport-include/linux/i2c-mux.h
diff --git a/backport/backport-include/linux/i2c-mux.h b/backport/backport-include/linux/i2c-mux.h
new file mode 100644
index 0000000..a3a67ad
--- /dev/null
+++ b/backport/backport-include/linux/i2c-mux.h
@@ -0,0 +1,11 @@
+#ifndef __BACKPORT_LINUX_I2C_MUX_H
+#define __BACKPORT_LINUX_I2C_MUX_H
+#include_next <linux/i2c-mux.h>
+#include <linux/version.h>
+
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0))
+#define i2c_add_mux_adapter(parent, mux_dev, mux_priv, force_nr, chan_id, class, select, deselect) \
+ i2c_add_mux_adapter(parent, mux_dev, mux_priv, force_nr, chan_id, select, deselect)
+#endif
+
+#endif /* __BACKPORT_LINUX_I2C_MUX_H */
--
1.7.10.4
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 16/17] backports: update kernel versions
2014-01-08 0:34 [PATCH 00/17] backports: bring to next-20131224 Hauke Mehrtens
` (14 preceding siblings ...)
2014-01-08 0:34 ` [PATCH 15/17] backports: fix i2c_add_mux_adapter() parameters Hauke Mehrtens
@ 2014-01-08 0:34 ` Hauke Mehrtens
2014-01-18 20:01 ` [PATCH v2] " Hauke Mehrtens
2014-01-08 0:34 ` [PATCH 17/17] backports: refresh on next-20131224 Hauke Mehrtens
16 siblings, 1 reply; 19+ messages in thread
From: Hauke Mehrtens @ 2014-01-08 0:34 UTC (permalink / raw)
To: mcgrof; +Cc: backports, Hauke Mehrtens
Update to current versions.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
devel/backports-update-manager | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/devel/backports-update-manager b/devel/backports-update-manager
index c0365cc..7c2a59b 100755
--- a/devel/backports-update-manager
+++ b/devel/backports-update-manager
@@ -39,18 +39,18 @@ KERNEL_URLS = [
KPATH + "v2.6.39.4-oneiric/linux-headers-2.6.39-02063904_2.6.39-02063904.201108040905_all.deb",
KPATH + "v3.0.101-oneiric/linux-headers-3.0.101-0300101_3.0.101-0300101.201310220446_all.deb",
KPATH + "v3.1.10-precise/linux-headers-3.1.10-030110_3.1.10-030110.201201181135_all.deb",
- KPATH + "v3.2.52-precise/linux-headers-3.2.52-030252_3.2.52-030252.201310262335_all.deb",
+ KPATH + "v3.2.54-precise/linux-headers-3.2.54-030254_3.2.54-030254.201401030035_all.deb",
KPATH + "v3.3.8-quantal/linux-headers-3.3.8-030308_3.3.8-030308.201206041356_all.deb",
- KPATH + "v3.4.70-quantal/linux-headers-3.4.70-030470_3.4.70-030470.201311201436_all.deb",
+ KPATH + "v3.4.75-quantal/linux-headers-3.4.75-030475_3.4.75-030475.201312201255_all.deb",
KPATH + "v3.5.7.12-quantal/linux-headers-3.5.7-03050712_3.5.7-03050712.201305111435_all.deb",
KPATH + "v3.6.11-raring/linux-headers-3.6.11-030611_3.6.11-030611.201212171335_all.deb",
KPATH + "v3.7.10-raring/linux-headers-3.7.10-030710_3.7.10-030710.201302271235_all.deb",
KPATH + "v3.8.13-raring/linux-headers-3.8.13-030813_3.8.13-030813.201305111843_all.deb",
KPATH + "v3.9.11-saucy/linux-headers-3.9.11-030911_3.9.11-030911.201307202035_all.deb",
- KPATH + "v3.10.20-saucy/linux-headers-3.10.20-031020_3.10.20-031020.201311201536_all.deb",
- KPATH + "v3.11.9-saucy/linux-headers-3.11.9-031109_3.11.9-031109.201311201635_all.deb",
- KPATH + "v3.12.1-trusty/linux-headers-3.12.1-031201_3.12.1-031201.201311201654_all.deb",
- KPATH + "v3.13-rc1-trusty/linux-headers-3.13.0-031300rc1_3.13.0-031300rc1.201311221535_all.deb",
+ KPATH + "v3.10.25-saucy/linux-headers-3.10.25-031025_3.10.25-031025.201312201135_all.deb",
+ KPATH + "v3.11.10-saucy/linux-headers-3.11.10-031110_3.11.10-031110.201311291453_all.deb",
+ KPATH + "v3.12.6-trusty/linux-headers-3.12.6-031206_3.12.6-031206.201312201218_all.deb",
+ KPATH + "v3.13-rc7-trusty/linux-headers-3.13.0-031300rc7_3.13.0-031300rc7.201401041835_all.deb",
]
NUM_KERNELS=len(KERNEL_URLS)
--
1.7.10.4
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 17/17] backports: refresh on next-20131224
2014-01-08 0:34 [PATCH 00/17] backports: bring to next-20131224 Hauke Mehrtens
` (15 preceding siblings ...)
2014-01-08 0:34 ` [PATCH 16/17] backports: update kernel versions Hauke Mehrtens
@ 2014-01-08 0:34 ` Hauke Mehrtens
16 siblings, 0 replies; 19+ messages in thread
From: Hauke Mehrtens @ 2014-01-08 0:34 UTC (permalink / raw)
To: mcgrof; +Cc: backports, Hauke Mehrtens
manual changes done to:
patches/collateral-evolutions/network/25-multicast-list_head/include_net_mac80211.patch
patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_driver-ops.patch
patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_iface.patch
patches/collateral-evolutions/network/64-b44-32bit-stats/drivers_net_ethernet_broadcom_b44.patch
patches/collateral-evolutions/network/70-umode_t-api-change/drivers_net_wireless_ath_ath9k_debug.patch
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.52 [ OK ]
19 3.3.8 [ OK ]
20 3.4.70 [ 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.20 [ OK ]
27 3.11.9 [ OK ]
28 3.12.1 [ OK ]
29 3.13-rc1 [ FAIL ]
With Kernel 3.13-rc7 I was able to build successfully.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
.../media/0004-sysfs-api.patch | 6 ++--
.../mac80211.patch | 4 +--
.../0006-disable-dump-adjust-on-old-kernels.patch | 4 +--
.../include_net_cfg80211.patch | 2 +-
.../net_wireless_core.patch | 2 +-
...rivers_net_wireless_iwlwifi_pcie_internal.patch | 4 +--
.../drivers_net_wireless_iwlwifi_pcie_trans.patch | 4 +--
.../net_wireless_core.patch | 4 +--
.../16-bluetooth/net_bluetooth_hci_sock.patch | 4 +--
.../17-netdev-queue/net_mac80211_iface.patch | 4 +--
.../drivers_net_wireless_zd1211rw_zd_mac.patch | 2 +-
.../include_net_mac80211.patch | 15 +--------
.../net_mac80211_driver-ops.patch | 33 +-------------------
.../net_mac80211_ieee80211_i.patch | 2 +-
.../net_mac80211_iface.patch | 16 +++-------
.../25-multicast-list_head/net_mac80211_main.patch | 2 +-
.../30-bridge-port/net_wireless_nl80211.patch | 2 +-
.../network/36-workqueue/net_mac80211_main.patch | 2 +-
...ers_net_ethernet_atheros_atl1c_atl1c_main.patch | 12 +++----
.../42-netlink_seq/net_wireless_nl80211.patch | 2 +-
.../54-get_ts_info/drivers_net_usb_usbnet.patch | 2 +-
...ers_net_ethernet_atheros_atl1c_atl1c_main.patch | 2 +-
.../61-netdev-addr_assign_type/usbnet.patch | 2 +-
.../drivers_net_ethernet_broadcom_b44.patch | 8 ++---
.../69-wowlan-no-socket/net_wireless_nl80211.patch | 2 +-
.../drivers_net_wireless_ath_ath9k_debug.patch | 6 ++--
.../network/76-sysfs-api/drivers_bcma.patch | 2 +-
.../network/77-led-blink-api/mac80211.patch | 2 +-
.../network/78-usb-sg/usbnet.patch | 12 +++----
.../network/81-genl-const/nfc.patch | 4 +--
.../network/81-genl-const/nl80211.patch | 6 ++--
31 files changed, 61 insertions(+), 113 deletions(-)
diff --git a/patches/collateral-evolutions/media/0004-sysfs-api.patch b/patches/collateral-evolutions/media/0004-sysfs-api.patch
index 23c445d..fd22975 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
-@@ -86,7 +86,12 @@ static struct attribute *video_device_at
+@@ -90,7 +90,12 @@ static struct attribute *video_device_at
&dev_attr_index.attr,
NULL,
};
@@ -13,7 +13,7 @@
/*
* Active devices
-@@ -221,7 +226,11 @@ static void v4l2_device_release(struct d
+@@ -225,7 +230,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)
-@@ -990,6 +999,7 @@ static int __init videodev_init(void)
+@@ -999,6 +1008,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 ab1ed2b..ed89650 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
-@@ -1623,6 +1623,7 @@ int ieee80211_if_add(struct ieee80211_lo
+@@ -1593,6 +1593,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 */
-@@ -1631,6 +1632,7 @@ int ieee80211_if_add(struct ieee80211_lo
+@@ -1601,6 +1602,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 41dd968..739448e 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
-@@ -1664,6 +1664,7 @@ static int nl80211_dump_wiphy(struct sk_
+@@ -1682,6 +1682,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
-@@ -1684,6 +1685,7 @@ static int nl80211_dump_wiphy(struct sk_
+@@ -1702,6 +1703,7 @@ static int nl80211_dump_wiphy(struct sk_
rtnl_unlock();
return 1;
}
diff --git a/patches/collateral-evolutions/network/09-cfg80211-wext-padding/include_net_cfg80211.patch b/patches/collateral-evolutions/network/09-cfg80211-wext-padding/include_net_cfg80211.patch
index 7b86184..bc49087 100644
--- a/patches/collateral-evolutions/network/09-cfg80211-wext-padding/include_net_cfg80211.patch
+++ b/patches/collateral-evolutions/network/09-cfg80211-wext-padding/include_net_cfg80211.patch
@@ -1,6 +1,6 @@
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
-@@ -2792,6 +2792,9 @@ struct wiphy_coalesce_support {
+@@ -2828,6 +2828,9 @@ struct wiphy_vendor_command {
struct wiphy {
/* assign these fields before you register the wiphy */
diff --git a/patches/collateral-evolutions/network/09-cfg80211-wext-padding/net_wireless_core.patch b/patches/collateral-evolutions/network/09-cfg80211-wext-padding/net_wireless_core.patch
index 4f7b302..516ed36 100644
--- a/patches/collateral-evolutions/network/09-cfg80211-wext-padding/net_wireless_core.patch
+++ b/patches/collateral-evolutions/network/09-cfg80211-wext-padding/net_wireless_core.patch
@@ -1,6 +1,6 @@
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
-@@ -275,6 +275,17 @@ struct wiphy *wiphy_new(const struct cfg
+@@ -266,6 +266,17 @@ struct wiphy *wiphy_new(const struct cfg
struct cfg80211_registered_device *rdev;
int alloc_size;
diff --git a/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_iwlwifi_pcie_internal.patch b/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_iwlwifi_pcie_internal.patch
index 0059e0d..ef0df1f 100644
--- a/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_iwlwifi_pcie_internal.patch
+++ b/patches/collateral-evolutions/network/09-threaded-irq/drivers_net_wireless_iwlwifi_pcie_internal.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/iwlwifi/pcie/internal.h
+++ b/drivers/net/wireless/iwlwifi/pcie/internal.h
-@@ -313,6 +313,9 @@ struct iwl_trans_pcie {
+@@ -311,6 +311,9 @@ struct iwl_trans_pcie {
/*protect hw register */
spinlock_t reg_lock;
@@ -9,4 +9,4 @@
+#endif
};
- /**
+ #define IWL_TRANS_GET_PCIE_TRANS(_iwl_trans) \
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 9b1a6f6..34f8040 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
-@@ -909,12 +909,21 @@ void iwl_trans_pcie_free(struct iwl_tran
+@@ -899,12 +899,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);
-@@ -1609,9 +1618,16 @@ struct iwl_trans *iwl_trans_pcie_alloc(s
+@@ -1597,9 +1606,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/10-add-wext-handlers-to-netdev/net_wireless_core.patch b/patches/collateral-evolutions/network/10-add-wext-handlers-to-netdev/net_wireless_core.patch
index 5c933d6..9c6b7ae 100644
--- a/patches/collateral-evolutions/network/10-add-wext-handlers-to-netdev/net_wireless_core.patch
+++ b/patches/collateral-evolutions/network/10-add-wext-handlers-to-netdev/net_wireless_core.patch
@@ -1,6 +1,6 @@
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
-@@ -327,10 +327,6 @@ struct wiphy *wiphy_new(const struct cfg
+@@ -318,10 +318,6 @@ struct wiphy *wiphy_new(const struct cfg
INIT_WORK(&rdev->sched_scan_results_wk, __cfg80211_sched_scan_results);
INIT_DELAYED_WORK(&rdev->dfs_update_channels_wk,
cfg80211_dfs_channels_update_work);
@@ -11,7 +11,7 @@
device_initialize(&rdev->wiphy.dev);
rdev->wiphy.dev.class = &ieee80211_class;
rdev->wiphy.dev.platform_data = rdev;
-@@ -852,6 +848,15 @@ static int cfg80211_netdev_notifier_call
+@@ -846,6 +842,15 @@ static int cfg80211_netdev_notifier_call
}
wdev->netdev = dev;
#ifdef CONFIG_CFG80211_WEXT
diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hci_sock.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hci_sock.patch
index 8208629..268f647 100644
--- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hci_sock.patch
+++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_hci_sock.patch
@@ -1,6 +1,6 @@
--- a/net/bluetooth/hci_sock.c
+++ b/net/bluetooth/hci_sock.c
-@@ -996,8 +996,13 @@ drop:
+@@ -1002,8 +1002,13 @@ drop:
goto done;
}
@@ -14,7 +14,7 @@
{
struct hci_ufilter uf = { .opcode = 0 };
struct sock *sk = sock->sk;
-@@ -1171,8 +1176,12 @@ static struct proto hci_sk_proto = {
+@@ -1177,8 +1182,12 @@ static struct proto hci_sk_proto = {
.obj_size = sizeof(struct hci_pinfo)
};
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 bbdee9c..7142517 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
-@@ -1750,6 +1750,7 @@ void ieee80211_sdata_stop(struct ieee802
+@@ -1717,6 +1717,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;
-@@ -1786,6 +1787,22 @@ void ieee80211_remove_interfaces(struct
+@@ -1753,6 +1754,22 @@ void ieee80211_remove_interfaces(struct
kfree(sdata);
}
}
diff --git a/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_zd1211rw_zd_mac.patch b/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_zd1211rw_zd_mac.patch
index 27338cd..ba9845c 100644
--- a/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_zd1211rw_zd_mac.patch
+++ b/patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_zd1211rw_zd_mac.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/zd1211rw/zd_mac.c
+++ b/drivers/net/wireless/zd1211rw/zd_mac.c
-@@ -1215,17 +1215,34 @@ static void zd_process_intr(struct work_
+@@ -1214,17 +1214,34 @@ static void zd_process_intr(struct work_
static u64 zd_op_prepare_multicast(struct ieee80211_hw *hw,
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 6fefdf7..618df66 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
-@@ -2759,14 +2759,24 @@ struct ieee80211_ops {
+@@ -2787,7 +2787,11 @@ struct ieee80211_ops {
void (*stop_ap)(struct ieee80211_hw *hw, struct ieee80211_vif *vif);
u64 (*prepare_multicast)(struct ieee80211_hw *hw,
@@ -12,16 +12,3 @@
void (*configure_filter)(struct ieee80211_hw *hw,
unsigned int changed_flags,
unsigned int *total_flags,
- u64 multicast);
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
- void (*set_multicast_list)(struct ieee80211_hw *hw,
- struct ieee80211_vif *vif, bool allmulti,
- struct netdev_hw_addr_list *mc_list);
-+#else
-+ void (*set_multicast_list)(struct ieee80211_hw *hw,
-+ struct ieee80211_vif *vif, bool allmulti,
-+ int mc_count, struct dev_addr_list *ha);
-+#endif
-
- int (*set_tim)(struct ieee80211_hw *hw, struct ieee80211_sta *sta,
- bool set);
diff --git a/patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_driver-ops.patch b/patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_driver-ops.patch
index 042cca7..0332c91 100644
--- a/patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_driver-ops.patch
+++ b/patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_driver-ops.patch
@@ -1,6 +1,6 @@
--- a/net/mac80211/driver-ops.h
+++ b/net/mac80211/driver-ops.h
-@@ -228,20 +228,35 @@ static inline void drv_bss_info_changed(
+@@ -228,14 +228,28 @@ static inline void drv_bss_info_changed(
}
static inline u64 drv_prepare_multicast(struct ieee80211_local *local,
@@ -29,34 +29,3 @@
trace_drv_return_u64(local, ret);
- return ret;
- }
-
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
- static inline void drv_set_multicast_list(struct ieee80211_local *local,
- struct ieee80211_sub_if_data *sdata,
- struct netdev_hw_addr_list *mc_list)
-@@ -257,6 +272,23 @@ static inline void drv_set_multicast_lis
- allmulti, mc_list);
- trace_drv_return_void(local);
- }
-+#else
-+static inline void drv_set_multicast_list(struct ieee80211_local *local,
-+ struct ieee80211_sub_if_data *sdata,
-+ int mc_count, struct dev_addr_list *ha)
-+{
-+ bool allmulti = sdata->flags & IEEE80211_SDATA_ALLMULTI;
-+
-+ trace_drv_set_multicast_list(local, sdata, mc_count);
-+
-+ check_sdata_in_driver(sdata);
-+
-+ if (local->ops->set_multicast_list)
-+ local->ops->set_multicast_list(&local->hw, &sdata->vif,
-+ allmulti, mc_count, ha);
-+ trace_drv_return_void(local);
-+}
-+#endif
-
- static inline void drv_configure_filter(struct ieee80211_local *local,
- unsigned int changed_flags,
diff --git a/patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_ieee80211_i.patch b/patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_ieee80211_i.patch
index 22300b9..5b264d2 100644
--- a/patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_ieee80211_i.patch
+++ b/patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_ieee80211_i.patch
@@ -1,6 +1,6 @@
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
-@@ -1003,7 +1003,12 @@ struct ieee80211_local {
+@@ -1006,7 +1006,12 @@ struct ieee80211_local {
struct work_struct reconfig_filter;
/* aggregated multicast list */
diff --git a/patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_iface.patch b/patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_iface.patch
index 93014c9..361687c 100644
--- a/patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_iface.patch
+++ b/patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_iface.patch
@@ -1,6 +1,6 @@
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
-@@ -810,8 +810,13 @@ static void ieee80211_do_stop(struct iee
+@@ -808,8 +808,13 @@ static void ieee80211_do_stop(struct iee
if (sdata->dev) {
netif_addr_lock_bh(sdata->dev);
spin_lock_bh(&local->filter_lock);
@@ -14,17 +14,9 @@
spin_unlock_bh(&local->filter_lock);
netif_addr_unlock_bh(sdata->dev);
}
-@@ -1027,10 +1032,20 @@ static void ieee80211_set_multicast_list
- if (sdata->vif.type != NL80211_IFTYPE_MONITOR &&
- sdata->vif.type != NL80211_IFTYPE_AP_VLAN &&
- sdata->vif.type != NL80211_IFTYPE_AP)
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
- drv_set_multicast_list(local, sdata, &dev->mc);
-+#else
-+ drv_set_multicast_list(local, sdata, dev->mc_count,
-+ dev->mc_list);
-+#endif
-
+@@ -1009,7 +1014,12 @@ static void ieee80211_set_multicast_list
+ sdata->flags ^= IEEE80211_SDATA_PROMISC;
+ }
spin_lock_bh(&local->filter_lock);
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
__hw_addr_sync(&local->mc_list, &dev->mc, dev->addr_len);
diff --git a/patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_main.patch b/patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_main.patch
index b1df3b7..b88e485 100644
--- a/patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_main.patch
+++ b/patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_main.patch
@@ -12,7 +12,7 @@
spin_unlock_bh(&local->filter_lock);
/* be a bit nasty */
-@@ -590,9 +594,11 @@ struct ieee80211_hw *ieee80211_alloc_hw(
+@@ -586,9 +590,11 @@ struct ieee80211_hw *ieee80211_alloc_hw(
wiphy->vht_capa_mod_mask = &mac80211_vht_capa_mod_mask;
INIT_LIST_HEAD(&local->interfaces);
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 072db59..6940eb0 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
-@@ -2363,7 +2363,7 @@ static int nl80211_valid_4addr(struct cf
+@@ -2381,7 +2381,7 @@ static int nl80211_valid_4addr(struct cf
enum nl80211_iftype iftype)
{
if (!use_4addr) {
diff --git a/patches/collateral-evolutions/network/36-workqueue/net_mac80211_main.patch b/patches/collateral-evolutions/network/36-workqueue/net_mac80211_main.patch
index 741dcf6..552d1c8 100644
--- a/patches/collateral-evolutions/network/36-workqueue/net_mac80211_main.patch
+++ b/patches/collateral-evolutions/network/36-workqueue/net_mac80211_main.patch
@@ -1,6 +1,6 @@
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
-@@ -1199,6 +1199,10 @@ static void __exit ieee80211_exit(void)
+@@ -1195,6 +1195,10 @@ static void __exit ieee80211_exit(void)
rc80211_minstrel_ht_exit();
rc80211_minstrel_exit();
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 c2a1f19..641d080 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
@@ -1,6 +1,6 @@
--- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
+++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
-@@ -492,6 +492,7 @@ static void atl1c_set_rxbufsize(struct a
+@@ -494,6 +494,7 @@ static void atl1c_set_rxbufsize(struct a
adapter->rx_frag_size = roundup_pow_of_two(head_size);
}
@@ -8,7 +8,7 @@
static netdev_features_t atl1c_fix_features(struct net_device *netdev,
netdev_features_t features)
{
-@@ -520,6 +521,7 @@ static int atl1c_set_features(struct net
+@@ -522,6 +523,7 @@ static int atl1c_set_features(struct net
return 0;
}
@@ -16,7 +16,7 @@
/**
* atl1c_change_mtu - Change the Maximum Transfer Unit
-@@ -552,8 +554,19 @@ static int atl1c_change_mtu(struct net_d
+@@ -554,8 +556,19 @@ static int atl1c_change_mtu(struct net_d
netdev->mtu = new_mtu;
adapter->hw.max_frame_size = new_mtu;
atl1c_set_rxbufsize(adapter, netdev);
@@ -36,7 +36,7 @@
atl1c_up(adapter);
clear_bit(__AT_RESETTING, &adapter->flags);
}
-@@ -2493,8 +2506,10 @@ static const struct net_device_ops atl1c
+@@ -2495,8 +2508,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,
-@@ -2512,6 +2527,7 @@ static int atl1c_init_netdev(struct net_
+@@ -2514,6 +2529,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 |
-@@ -2520,6 +2536,14 @@ static int atl1c_init_netdev(struct net_
+@@ -2522,6 +2538,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/42-netlink_seq/net_wireless_nl80211.patch b/patches/collateral-evolutions/network/42-netlink_seq/net_wireless_nl80211.patch
index 106783e..d8155f8 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
-@@ -5959,7 +5959,9 @@ static int nl80211_dump_scan(struct sk_b
+@@ -5988,7 +5988,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/54-get_ts_info/drivers_net_usb_usbnet.patch b/patches/collateral-evolutions/network/54-get_ts_info/drivers_net_usb_usbnet.patch
index 5e2cfaa..788df56 100644
--- a/patches/collateral-evolutions/network/54-get_ts_info/drivers_net_usb_usbnet.patch
+++ b/patches/collateral-evolutions/network/54-get_ts_info/drivers_net_usb_usbnet.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
-@@ -1026,7 +1026,9 @@ static const struct ethtool_ops usbnet_e
+@@ -1025,7 +1025,9 @@ static const struct ethtool_ops usbnet_e
.get_drvinfo = usbnet_get_drvinfo,
.get_msglevel = usbnet_get_msglevel,
.set_msglevel = usbnet_set_msglevel,
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 6961c1a..d26d40e 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
-@@ -2656,7 +2656,9 @@ static int atl1c_probe(struct pci_dev *p
+@@ -2658,7 +2658,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/usbnet.patch b/patches/collateral-evolutions/network/61-netdev-addr_assign_type/usbnet.patch
index 11338bd..c8e72e7 100644
--- a/patches/collateral-evolutions/network/61-netdev-addr_assign_type/usbnet.patch
+++ b/patches/collateral-evolutions/network/61-netdev-addr_assign_type/usbnet.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
-@@ -1672,9 +1672,11 @@ usbnet_probe (struct usb_interface *udev
+@@ -1671,9 +1671,11 @@ usbnet_probe (struct usb_interface *udev
dev->rx_urb_size = dev->hard_mtu;
dev->maxpacket = usb_maxpacket (dev->udev, dev->out, 1);
diff --git a/patches/collateral-evolutions/network/64-b44-32bit-stats/drivers_net_ethernet_broadcom_b44.patch b/patches/collateral-evolutions/network/64-b44-32bit-stats/drivers_net_ethernet_broadcom_b44.patch
index bbb8c97..a16ba7d 100644
--- a/patches/collateral-evolutions/network/64-b44-32bit-stats/drivers_net_ethernet_broadcom_b44.patch
+++ b/patches/collateral-evolutions/network/64-b44-32bit-stats/drivers_net_ethernet_broadcom_b44.patch
@@ -1,14 +1,14 @@
--- a/drivers/net/ethernet/broadcom/b44.c
+++ b/drivers/net/ethernet/broadcom/b44.c
-@@ -29,6 +29,7 @@
- #include <linux/dma-mapping.h>
+@@ -31,6 +31,7 @@
#include <linux/ssb/ssb.h>
#include <linux/slab.h>
+ #include <linux/phy.h>
+#include <linux/u64_stats_sync.h>
#include <asm/uaccess.h>
#include <asm/io.h>
-@@ -1646,10 +1647,17 @@ static int b44_close(struct net_device *
+@@ -1670,10 +1671,17 @@ static int b44_close(struct net_device *
return 0;
}
@@ -26,7 +26,7 @@
struct b44_hw_stats *hwstat = &bp->hw_stats;
unsigned int start;
-@@ -2134,7 +2142,11 @@ static const struct net_device_ops b44_n
+@@ -2183,7 +2191,11 @@ static const struct net_device_ops b44_n
.ndo_open = b44_open,
.ndo_stop = b44_close,
.ndo_start_xmit = b44_start_xmit,
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 1ed8f4d..88d716c 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
-@@ -8095,7 +8095,7 @@ static int nl80211_parse_wowlan_tcp(stru
+@@ -8176,7 +8176,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/70-umode_t-api-change/drivers_net_wireless_ath_ath9k_debug.patch b/patches/collateral-evolutions/network/70-umode_t-api-change/drivers_net_wireless_ath_ath9k_debug.patch
index bf041df..7f85a49 100644
--- a/patches/collateral-evolutions/network/70-umode_t-api-change/drivers_net_wireless_ath_ath9k_debug.patch
+++ b/patches/collateral-evolutions/network/70-umode_t-api-change/drivers_net_wireless_ath_ath9k_debug.patch
@@ -1,6 +1,6 @@
---- a/drivers/net/wireless/ath/ath9k/debug.c
-+++ b/drivers/net/wireless/ath/ath9k/debug.c
-@@ -1266,7 +1266,11 @@ static const struct file_operations fops
+--- a/drivers/net/wireless/ath/ath9k/spectral.c
++++ b/drivers/net/wireless/ath/ath9k/spectral.c
+@@ -478,7 +478,11 @@ static const struct file_operations fops
static struct dentry *create_buf_file_handler(const char *filename,
struct dentry *parent,
diff --git a/patches/collateral-evolutions/network/76-sysfs-api/drivers_bcma.patch b/patches/collateral-evolutions/network/76-sysfs-api/drivers_bcma.patch
index 68214b6..e5dcaaf 100644
--- a/patches/collateral-evolutions/network/76-sysfs-api/drivers_bcma.patch
+++ b/patches/collateral-evolutions/network/76-sysfs-api/drivers_bcma.patch
@@ -25,7 +25,7 @@
};
static u16 bcma_cc_core_id(struct bcma_bus *bus)
-@@ -492,6 +501,7 @@ static int __init bcma_modinit(void)
+@@ -493,6 +502,7 @@ static int __init bcma_modinit(void)
{
int err;
diff --git a/patches/collateral-evolutions/network/77-led-blink-api/mac80211.patch b/patches/collateral-evolutions/network/77-led-blink-api/mac80211.patch
index efb823c..d5f8878 100644
--- a/patches/collateral-evolutions/network/77-led-blink-api/mac80211.patch
+++ b/patches/collateral-evolutions/network/77-led-blink-api/mac80211.patch
@@ -1,6 +1,6 @@
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
-@@ -1150,6 +1150,9 @@ struct ieee80211_local {
+@@ -1154,6 +1154,9 @@ struct ieee80211_local {
u32 dot11TransmittedFrameCount;
#ifdef CONFIG_MAC80211_LEDS
diff --git a/patches/collateral-evolutions/network/78-usb-sg/usbnet.patch b/patches/collateral-evolutions/network/78-usb-sg/usbnet.patch
index 6e2cdfe..7b1c4d9 100644
--- a/patches/collateral-evolutions/network/78-usb-sg/usbnet.patch
+++ b/patches/collateral-evolutions/network/78-usb-sg/usbnet.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
-@@ -1231,6 +1231,7 @@ EXPORT_SYMBOL_GPL(usbnet_tx_timeout);
+@@ -1230,6 +1230,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;
-@@ -1263,6 +1264,12 @@ static int build_dma_sg(const struct sk_
+@@ -1262,6 +1263,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)
-@@ -1319,12 +1326,19 @@ netdev_tx_t usbnet_start_xmit (struct sk
+@@ -1318,12 +1325,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;
-@@ -1379,7 +1393,9 @@ not_drop:
+@@ -1378,7 +1392,9 @@ not_drop:
if (skb)
dev_kfree_skb_any (skb);
if (urb) {
@@ -51,7 +51,7 @@
usb_free_urb(urb);
}
} else
-@@ -1432,7 +1448,9 @@ static void usbnet_bh (unsigned long par
+@@ -1431,7 +1447,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);
-@@ -1787,7 +1805,9 @@ int usbnet_resume (struct usb_interface
+@@ -1786,7 +1804,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/81-genl-const/nfc.patch b/patches/collateral-evolutions/network/81-genl-const/nfc.patch
index 3a34016..f3bc515 100644
--- a/patches/collateral-evolutions/network/81-genl-const/nfc.patch
+++ b/patches/collateral-evolutions/network/81-genl-const/nfc.patch
@@ -1,6 +1,6 @@
--- a/net/nfc/netlink.c
+++ b/net/nfc/netlink.c
-@@ -30,7 +30,7 @@
+@@ -28,7 +28,7 @@
#include "nfc.h"
#include "llcp.h"
@@ -9,7 +9,7 @@
{ .name = NFC_GENL_MCAST_EVENT_NAME, },
};
-@@ -1364,7 +1364,7 @@ static int nfc_genl_se_io(struct sk_buff
+@@ -1362,7 +1362,7 @@ static int nfc_genl_se_io(struct sk_buff
return dev->ops->se_io(dev, se_idx, apdu, apdu_len, se_io_cb, ctx);
}
diff --git a/patches/collateral-evolutions/network/81-genl-const/nl80211.patch b/patches/collateral-evolutions/network/81-genl-const/nl80211.patch
index 6e50898..e4a5858 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", },
-@@ -8890,7 +8890,7 @@ static int nl80211_crit_protocol_stop(st
+@@ -9076,7 +9076,7 @@ EXPORT_SYMBOL_GPL(cfg80211_vendor_cmd_re
#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;
-@@ -8959,7 +8959,7 @@ static int nl80211_pre_doit(const struct
+@@ -9145,7 +9145,7 @@ static int nl80211_pre_doit(const struct
return 0;
}
@@ -39,7 +39,7 @@
struct genl_info *info)
{
if (info->user_ptr[1]) {
-@@ -8976,7 +8976,7 @@ static void nl80211_post_doit(const stru
+@@ -9162,7 +9162,7 @@ static void nl80211_post_doit(const stru
rtnl_unlock();
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH v2] backports: update kernel versions
2014-01-08 0:34 ` [PATCH 16/17] backports: update kernel versions Hauke Mehrtens
@ 2014-01-18 20:01 ` Hauke Mehrtens
0 siblings, 0 replies; 19+ messages in thread
From: Hauke Mehrtens @ 2014-01-18 20:01 UTC (permalink / raw)
To: mcgrof; +Cc: backports, Hauke Mehrtens
Update to current versions.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
devel/backports-update-manager | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/devel/backports-update-manager b/devel/backports-update-manager
index c0365cc..584309b 100755
--- a/devel/backports-update-manager
+++ b/devel/backports-update-manager
@@ -39,18 +39,18 @@ KERNEL_URLS = [
KPATH + "v2.6.39.4-oneiric/linux-headers-2.6.39-02063904_2.6.39-02063904.201108040905_all.deb",
KPATH + "v3.0.101-oneiric/linux-headers-3.0.101-0300101_3.0.101-0300101.201310220446_all.deb",
KPATH + "v3.1.10-precise/linux-headers-3.1.10-030110_3.1.10-030110.201201181135_all.deb",
- KPATH + "v3.2.52-precise/linux-headers-3.2.52-030252_3.2.52-030252.201310262335_all.deb",
+ KPATH + "v3.2.54-precise/linux-headers-3.2.54-030254_3.2.54-030254.201401030035_all.deb",
KPATH + "v3.3.8-quantal/linux-headers-3.3.8-030308_3.3.8-030308.201206041356_all.deb",
- KPATH + "v3.4.70-quantal/linux-headers-3.4.70-030470_3.4.70-030470.201311201436_all.deb",
+ KPATH + "v3.4.77-quantal/linux-headers-3.4.77-030477_3.4.77-030477.201401151835_all.deb",
KPATH + "v3.5.7.12-quantal/linux-headers-3.5.7-03050712_3.5.7-03050712.201305111435_all.deb",
KPATH + "v3.6.11-raring/linux-headers-3.6.11-030611_3.6.11-030611.201212171335_all.deb",
KPATH + "v3.7.10-raring/linux-headers-3.7.10-030710_3.7.10-030710.201302271235_all.deb",
KPATH + "v3.8.13-raring/linux-headers-3.8.13-030813_3.8.13-030813.201305111843_all.deb",
KPATH + "v3.9.11-saucy/linux-headers-3.9.11-030911_3.9.11-030911.201307202035_all.deb",
- KPATH + "v3.10.20-saucy/linux-headers-3.10.20-031020_3.10.20-031020.201311201536_all.deb",
- KPATH + "v3.11.9-saucy/linux-headers-3.11.9-031109_3.11.9-031109.201311201635_all.deb",
- KPATH + "v3.12.1-trusty/linux-headers-3.12.1-031201_3.12.1-031201.201311201654_all.deb",
- KPATH + "v3.13-rc1-trusty/linux-headers-3.13.0-031300rc1_3.13.0-031300rc1.201311221535_all.deb",
+ KPATH + "v3.10.27-saucy/linux-headers-3.10.27-031027_3.10.27-031027.201401151935_all.deb",
+ KPATH + "v3.11.10-saucy/linux-headers-3.11.10-031110_3.11.10-031110.201311291453_all.deb",
+ KPATH + "v3.12.8-trusty/linux-headers-3.12.8-031208_3.12.8-031208.201401151952_all.deb",
+ KPATH + "v3.13-rc8-trusty/linux-headers-3.13.0-031300rc8_3.13.0-031300rc8.201401120535_all.deb",
]
NUM_KERNELS=len(KERNEL_URLS)
--
1.7.10.4
^ permalink raw reply related [flat|nested] 19+ messages in thread
end of thread, other threads:[~2014-01-18 20:04 UTC | newest]
Thread overview: 19+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-01-08 0:34 [PATCH 00/17] backports: bring to next-20131224 Hauke Mehrtens
2014-01-08 0:34 ` [PATCH 01/17] backports: add devm_kmalloc() Hauke Mehrtens
2014-01-08 0:34 ` [PATCH 02/17] backports: add netdev_notify_peers() Hauke Mehrtens
2014-01-08 0:34 ` [PATCH 03/17] backports: add ARPHRD_6LOWPAN Hauke Mehrtens
2014-01-08 0:34 ` [PATCH 04/17] backports: add include/trace/events/v4l2.h file Hauke Mehrtens
2014-01-08 0:34 ` [PATCH 05/17] backports: fix number of arguments of phy_connect() Hauke Mehrtens
2014-01-08 0:34 ` [PATCH 06/17] backports: make b44 depend on kernel > 2.6.28 Hauke Mehrtens
2014-01-08 0:34 ` [PATCH 07/17] backports: remove usage of members of struct property for kernel < 2.6.39 Hauke Mehrtens
2014-01-08 0:34 ` [PATCH 08/17] backports: add include/net/af_ieee802154.h file Hauke Mehrtens
2014-01-08 0:34 ` [PATCH 09/17] backports: remove usage of addr_assign_type in 6lowpan.c Hauke Mehrtens
2014-01-08 0:34 ` [PATCH 10/17] backports: backport multicast list handling in iwlwifi mvm Hauke Mehrtens
2014-01-08 0:34 ` [PATCH 11/17] backports: remove CRC8 backport Hauke Mehrtens
2014-01-08 0:34 ` [PATCH 12/17] backports: add printk_ratelimited() Hauke Mehrtens
2014-01-08 0:34 ` [PATCH 13/17] backports: build some regulator drivers only with recent kernels Hauke Mehrtens
2014-01-08 0:34 ` [PATCH 14/17] backports: copy include/uapi/linux/vsp1.h Hauke Mehrtens
2014-01-08 0:34 ` [PATCH 15/17] backports: fix i2c_add_mux_adapter() parameters Hauke Mehrtens
2014-01-08 0:34 ` [PATCH 16/17] backports: update kernel versions Hauke Mehrtens
2014-01-18 20:01 ` [PATCH v2] " Hauke Mehrtens
2014-01-08 0:34 ` [PATCH 17/17] backports: refresh on next-20131224 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.