[PATCH 00/19] backports: add support for next-20140606

[PATCH 00/19] backports: add support for next-20140606

[Hauke Mehrtens]

This brings backports to backports-20140606.

1   3.0.101             [  OK  ]
2   3.1.10              [  OK  ]
3   3.2.59              [  OK  ]
4   3.3.8               [  OK  ]
5   3.4.91              [  OK  ]
6   3.5.7               [  OK  ]
7   3.6.11              [  OK  ]
8   3.7.10              [  OK  ]
9   3.8.13              [  OK  ]
10  3.9.11              [  OK  ]
11  3.10.40             [  OK  ]
12  3.11.10             [  OK  ]
13  3.12.20             [  OK  ]
14  3.13.11             [  OK  ]
15  3.14.4              [  OK  ]
16  3.15-rc7            [  OK  ]


Hauke Mehrtens (19):
  backports: remove upstream patches
  backports: remove USHORT_MAX from kernel.h
  backports: add U32_MAX
  backports: add prandom_u32_max()
  backports: add crc7_be()
  backports: remove parameter from dma_buf_export()
  backports: add of_node_put()
  backports: add of_match_ptr()
  backports: add split_page()
  backports: copy include/linux/platform_data/st21nfca.h
  backports: remove usage of get_ts_info in cdc_ncm.c
  backports: handle rename of ndo_set_vf_tx_rate to ndo_set_vf_rate
  backports: do not access user_ns on struct net
  backports: remove const from pci error handlers on kernel < 3.7
  backports: add hashtable.h
  backports: make some regulator drivers depend on more recent kernel
    versions
  backports: activate NFC_TRF7970A on kernel 3.4
  backports: remove useless git patch header
  backports: refresh patches on next-20140606

 backport/backport-include/linux/crc7.h             | 14 ++++
 backport/backport-include/linux/dma-buf.h          |  9 +++
 backport/backport-include/linux/kernel.h           | 10 ++-
 backport/backport-include/linux/of.h               | 20 ++++++
 backport/backport-include/linux/random.h           | 20 ++++++
 backport/compat/backport-3.10.c                    | 46 ++++++++++++
 copy-list                                          |  2 +
 dependencies                                       |  9 ++-
 .../0003-technisat-usb2-led-rename.patch           | 83 ----------------------
 .../0004-bt8xx-rename-dst-ops.patch                | 67 -----------------
 .../media/0002-no_dmabuf/v4l2.patch                | 24 +++----
 .../0002-disable-dump-adjust-on-old-kernels.patch  |  4 +-
 .../include_net_cfg80211.patch                     |  2 +-
 .../net_wireless_core.patch                        |  2 +-
 .../net_wireless_core.patch                        |  4 +-
 .../0014-netlink_seq/net_wireless_nl80211.patch    |  2 +-
 .../network/0017-get_ts_info/cdc_ncm.patch         | 12 ++++
 .../network/0017-get_ts_info/igb_get_ts_info.patch |  4 +-
 .../network/0024-led-blink-api/mac80211.patch      |  2 +-
 .../network/0027-genl-const/ieee802154.patch       |  4 +-
 .../network/0027-genl-const/nl80211.patch          |  6 +-
 .../network/0028-select_queue/mac80211.patch       |  6 +-
 .../network/0028-select_queue/mwifiex.patch        |  2 -
 .../0032-sriov_configure/igb_sriov_configure.patch | 10 ++-
 .../network/0033-ndo_vlan_rx_vid/cdc_mbim.patch    |  2 -
 .../0033-ndo_vlan_rx_vid/igb_ndo_vlan_rx_vid.patch | 10 ++-
 .../igb_ndo_set_vf_spoofchk.patch                  | 14 ++--
 .../network/0035-skb_no_fcs/igb_skb_no_fcs.patch   |  4 +-
 .../network/0036-ethtool_eee/igb_ethtool_eee.patch |  4 +-
 .../0037-ethtool_get_module/igb_get_module.patch   |  8 +--
 .../0038-ethtool_rxfh_indir/igb_rxfh_indir.patch   | 40 ++++++++---
 .../network/0039-ethtool_rxnfc/igb_rxnfc.patch     |  2 -
 .../igb_ethtool_cmd_mdix.patch                     |  2 -
 ...gb-devm_hwmon_device_register_with_groups.patch |  2 -
 .../network/0042-pci_error_handlers/alx.patch      | 14 ++++
 .../network/0042-pci_error_handlers/atl1c.patch    | 14 ++++
 .../network/0042-pci_error_handlers/atl1e.patch    | 14 ++++
 .../igb_pci_error_handlers.patch                   |  2 -
 .../network/0042-pci_error_handlers/ngene.patch    | 14 ++++
 .../network/0043-ndo_set_vf_rate/igb.patch         | 78 ++++++++++++++++++++
 .../0044-no_user_ns_in_net/ieee802154.patch        | 30 ++++++++
 41 files changed, 371 insertions(+), 247 deletions(-)
 create mode 100644 backport/backport-include/linux/crc7.h
 delete mode 100644 patches/0000-upstream-backport-changes/0003-technisat-usb2-led-rename.patch
 delete mode 100644 patches/0000-upstream-backport-changes/0004-bt8xx-rename-dst-ops.patch
 create mode 100644 patches/collateral-evolutions/network/0017-get_ts_info/cdc_ncm.patch
 create mode 100644 patches/collateral-evolutions/network/0042-pci_error_handlers/alx.patch
 create mode 100644 patches/collateral-evolutions/network/0042-pci_error_handlers/atl1c.patch
 create mode 100644 patches/collateral-evolutions/network/0042-pci_error_handlers/atl1e.patch
 create mode 100644 patches/collateral-evolutions/network/0042-pci_error_handlers/ngene.patch
 create mode 100644 patches/collateral-evolutions/network/0043-ndo_set_vf_rate/igb.patch
 create mode 100644 patches/collateral-evolutions/network/0044-no_user_ns_in_net/ieee802154.patch

-- 
1.9.1

[PATCH 01/19] backports: remove upstream patches

[Hauke Mehrtens]

These two patches are now in upstream linux kernel and not needed in
backports any more

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 .../0003-technisat-usb2-led-rename.patch           | 83 ----------------------
 .../0004-bt8xx-rename-dst-ops.patch                | 67 -----------------
 2 files changed, 150 deletions(-)
 delete mode 100644 patches/0000-upstream-backport-changes/0003-technisat-usb2-led-rename.patch
 delete mode 100644 patches/0000-upstream-backport-changes/0004-bt8xx-rename-dst-ops.patch

diff --git a/patches/0000-upstream-backport-changes/0003-technisat-usb2-led-rename.patch b/patches/0000-upstream-backport-changes/0003-technisat-usb2-led-rename.patch
deleted file mode 100644
index 4732392..0000000
--- a/patches/0000-upstream-backport-changes/0003-technisat-usb2-led-rename.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-This clashes with include/linux/leds.h namespace, fix this and
-also send this upstream eventually.
-
---- a/drivers/media/usb/dvb-usb/technisat-usb2.c
-+++ b/drivers/media/usb/dvb-usb/technisat-usb2.c
-@@ -214,10 +214,10 @@ static void technisat_usb2_frontend_rese
- 
- /* LED control */
- enum technisat_usb2_led_state {
--	LED_OFF,
--	LED_BLINK,
--	LED_ON,
--	LED_UNDEFINED
-+	TECH_LED_OFF,
-+	TECH_LED_BLINK,
-+	TECH_LED_ON,
-+	TECH_LED_UNDEFINED
- };
- 
- static int technisat_usb2_set_led(struct dvb_usb_device *d, int red, enum technisat_usb2_led_state state)
-@@ -229,14 +229,14 @@ static int technisat_usb2_set_led(struct
- 		0
- 	};
- 
--	if (disable_led_control && state != LED_OFF)
-+	if (disable_led_control && state != TECH_LED_OFF)
- 		return 0;
- 
- 	switch (state) {
--	case LED_ON:
-+	case TECH_LED_ON:
- 		led[1] = 0x82;
- 		break;
--	case LED_BLINK:
-+	case TECH_LED_BLINK:
- 		led[1] = 0x82;
- 		if (red) {
- 			led[2] = 0x02;
-@@ -251,7 +251,7 @@ static int technisat_usb2_set_led(struct
- 		break;
- 
- 	default:
--	case LED_OFF:
-+	case TECH_LED_OFF:
- 		led[1] = 0x80;
- 		break;
- 	}
-@@ -310,11 +310,11 @@ static void technisat_usb2_green_led_con
- 				goto schedule;
- 
- 			if (ber > 1000)
--				technisat_usb2_set_led(state->dev, 0, LED_BLINK);
-+				technisat_usb2_set_led(state->dev, 0, TECH_LED_BLINK);
- 			else
--				technisat_usb2_set_led(state->dev, 0, LED_ON);
-+				technisat_usb2_set_led(state->dev, 0, TECH_LED_ON);
- 		} else
--			technisat_usb2_set_led(state->dev, 0, LED_OFF);
-+			technisat_usb2_set_led(state->dev, 0, TECH_LED_OFF);
- 	}
- 
- schedule:
-@@ -365,9 +365,9 @@ static int technisat_usb2_power_ctrl(str
- 		return 0;
- 
- 	/* green led is turned off in any case - will be turned on when tuning */
--	technisat_usb2_set_led(d, 0, LED_OFF);
-+	technisat_usb2_set_led(d, 0, TECH_LED_OFF);
- 	/* red led is turned on all the time */
--	technisat_usb2_set_led(d, 1, LED_ON);
-+	technisat_usb2_set_led(d, 1, TECH_LED_ON);
- 	return 0;
- }
- 
-@@ -667,7 +667,7 @@ static int technisat_usb2_rc_query(struc
- 		return 0;
- 
- 	if (!disable_led_control)
--		technisat_usb2_set_led(d, 1, LED_BLINK);
-+		technisat_usb2_set_led(d, 1, TECH_LED_BLINK);
- 
- 	return 0;
- }
diff --git a/patches/0000-upstream-backport-changes/0004-bt8xx-rename-dst-ops.patch b/patches/0000-upstream-backport-changes/0004-bt8xx-rename-dst-ops.patch
deleted file mode 100644
index 2e8e1b3..0000000
--- a/patches/0000-upstream-backport-changes/0004-bt8xx-rename-dst-ops.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-This will be sent upstream... there is a conflict with these
-names and another symbol from older kernels.
-
---- a/drivers/media/pci/bt8xx/dst.c
-+++ b/drivers/media/pci/bt8xx/dst.c
-@@ -1544,7 +1544,7 @@ static int dst_send_burst(struct dvb_fro
- }
- 
- 
--static int dst_init(struct dvb_frontend *fe)
-+static int bt8xx_dst_init(struct dvb_frontend *fe)
- {
- 	struct dst_state *state = fe->demodulator_priv;
- 
-@@ -1707,7 +1707,7 @@ static int dst_get_frontend(struct dvb_f
- 	return 0;
- }
- 
--static void dst_release(struct dvb_frontend *fe)
-+static void bt8xx_dst_release(struct dvb_frontend *fe)
- {
- 	struct dst_state *state = fe->demodulator_priv;
- 	if (state->dst_ca) {
-@@ -1776,8 +1776,8 @@ static struct dvb_frontend_ops dst_dvbt_
- 			FE_CAN_GUARD_INTERVAL_AUTO
- 	},
- 
--	.release = dst_release,
--	.init = dst_init,
-+	.release = bt8xx_dst_release,
-+	.init = bt8xx_dst_init,
- 	.tune = dst_tune_frontend,
- 	.set_frontend = dst_set_frontend,
- 	.get_frontend = dst_get_frontend,
-@@ -1801,8 +1801,8 @@ static struct dvb_frontend_ops dst_dvbs_
- 		.caps = FE_CAN_FEC_AUTO | FE_CAN_QPSK
- 	},
- 
--	.release = dst_release,
--	.init = dst_init,
-+	.release = bt8xx_dst_release,
-+	.init = bt8xx_dst_init,
- 	.tune = dst_tune_frontend,
- 	.set_frontend = dst_set_frontend,
- 	.get_frontend = dst_get_frontend,
-@@ -1834,8 +1834,8 @@ static struct dvb_frontend_ops dst_dvbc_
- 			FE_CAN_QAM_256
- 	},
- 
--	.release = dst_release,
--	.init = dst_init,
-+	.release = bt8xx_dst_release,
-+	.init = bt8xx_dst_init,
- 	.tune = dst_tune_frontend,
- 	.set_frontend = dst_set_frontend,
- 	.get_frontend = dst_get_frontend,
-@@ -1857,8 +1857,8 @@ static struct dvb_frontend_ops dst_atsc_
- 		.caps = FE_CAN_FEC_AUTO | FE_CAN_QAM_AUTO | FE_CAN_QAM_64 | FE_CAN_QAM_256 | FE_CAN_8VSB
- 	},
- 
--	.release = dst_release,
--	.init = dst_init,
-+	.release = bt8xx_dst_release,
-+	.init = bt8xx_dst_init,
- 	.tune = dst_tune_frontend,
- 	.set_frontend = dst_set_frontend,
- 	.get_frontend = dst_get_frontend,
-- 
1.9.1

[PATCH 02/19] backports: remove USHORT_MAX from kernel.h

[Hauke Mehrtens]

This define is not in the kernel any more.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 backport/backport-include/linux/kernel.h | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/backport/backport-include/linux/kernel.h b/backport/backport-include/linux/kernel.h
index 707bed9..e695842 100644
--- a/backport/backport-include/linux/kernel.h
+++ b/backport/backport-include/linux/kernel.h
@@ -67,12 +67,6 @@
 #define lower_32_bits(n) ((u32)(n))
 #endif
 
-#ifndef USHORT_MAX
-#define USHORT_MAX      ((u16)(~0U))
-#define SHORT_MAX       ((s16)(USHORT_MAX>>1))
-#define SHORT_MIN       (-SHORT_MAX - 1)
-#endif
-
 #ifndef clamp
 #define clamp(val, min, max) ({			\
 	typeof(val) __val = (val);		\
-- 
1.9.1

[PATCH 03/19] backports: add U32_MAX

[Hauke Mehrtens]

This was added in:
commit 89a0714106aac7309c7dfa0f004b39e1e89d2942
Author: Alex Elder <alex.elder@linaro.org>
Date:   Thu Jan 23 15:54:00 2014 -0800

    kernel.h: define u8, s8, u32, etc. limits

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 backport/backport-include/linux/kernel.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/backport/backport-include/linux/kernel.h b/backport/backport-include/linux/kernel.h
index e695842..933686f 100644
--- a/backport/backport-include/linux/kernel.h
+++ b/backport/backport-include/linux/kernel.h
@@ -45,6 +45,10 @@
 #define SHRT_MIN       ((s16)(-SHRT_MAX - 1))
 #endif
 
+#ifndef U32_MAX
+#define U32_MAX		((u32)~0U)
+#endif
+
 #ifndef __round_mask
 #define __round_mask(x, y) ((__typeof__(x))((y)-1))
 #define round_up(x, y) ((((x)-1) | __round_mask(x, y))+1)
-- 
1.9.1

[PATCH 04/19] backports: add prandom_u32_max()

[Hauke Mehrtens]

This was added in:
commit f337db64af059c9a94278a8b0ab97d87259ff62f
Author: Daniel Borkmann <dborkman@redhat.com>
Date:   Wed Jan 22 02:29:39 2014 +0100

    random32: add prandom_u32_max and convert open coded users

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 backport/backport-include/linux/random.h | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/backport/backport-include/linux/random.h b/backport/backport-include/linux/random.h
index e915106..dd5f377 100644
--- a/backport/backport-include/linux/random.h
+++ b/backport/backport-include/linux/random.h
@@ -13,4 +13,24 @@
 void prandom_bytes(void *buf, int bytes);
 #endif
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,14,0)
+/**
+ * prandom_u32_max - returns a pseudo-random number in interval [0, ep_ro)
+ * @ep_ro: right open interval endpoint
+ *
+ * Returns a pseudo-random number that is in interval [0, ep_ro). Note
+ * that the result depends on PRNG being well distributed in [0, ~0U]
+ * u32 space. Here we use maximally equidistributed combined Tausworthe
+ * generator, that is, prandom_u32(). This is useful when requesting a
+ * random index of an array containing ep_ro elements, for example.
+ *
+ * Returns: pseudo-random number in interval [0, ep_ro)
+ */
+#define prandom_u32_max LINUX_BACKPORT(prandom_u32_max)
+static inline u32 prandom_u32_max(u32 ep_ro)
+{
+	return (u32)(((u64) prandom_u32() * ep_ro) >> 32);
+}
+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,14,0) */
+
 #endif /* __BACKPORT_RANDOM_H */
-- 
1.9.1

[PATCH 05/19] backports: add crc7_be()

[Hauke Mehrtens]

This was added in:
commit 1836eea209546b870dd83f3f4ef234d6598a560d
Author: George Spelvin <linux@horizon.com>
Date:   Sat May 10 10:32:57 2014 -0400

    lib/crc7: Shift crc7() output left 1 bit

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 backport/backport-include/linux/crc7.h | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 backport/backport-include/linux/crc7.h

diff --git a/backport/backport-include/linux/crc7.h b/backport/backport-include/linux/crc7.h
new file mode 100644
index 0000000..12747f8
--- /dev/null
+++ b/backport/backport-include/linux/crc7.h
@@ -0,0 +1,14 @@
+#ifndef _BACKPORT_LINUX_CRC7_H
+#define _BACKPORT_LINUX_CRC7_H
+#include_next <linux/crc7.h>
+#include <linux/version.h>
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,16,0)
+#define crc7_be LINUX_BACKPORT(crc7_be)
+static inline u8 crc7_be(u8 crc, const u8 *buffer, size_t len)
+{
+	return crc7(crc, buffer, len) << 1;
+}
+#endif /* < 3.16 */
+
+#endif /* _BACKPORT_LINUX_CRC7_H */
-- 
1.9.1

[PATCH 06/19] backports: remove parameter from dma_buf_export()

[Hauke Mehrtens]

dma_buf_export() got a new parameter which is not available in older
kernel versions.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 backport/backport-include/linux/dma-buf.h | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/backport/backport-include/linux/dma-buf.h b/backport/backport-include/linux/dma-buf.h
index 363b86f..85a1531 100644
--- a/backport/backport-include/linux/dma-buf.h
+++ b/backport/backport-include/linux/dma-buf.h
@@ -5,4 +5,13 @@
 #include_next <linux/dma-buf.h>
 #endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0) */
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
+#define dma_buf_export(priv, ops, size, flags, resv)	\
+	dma_buf_export(priv, ops, size, flags)
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(3,16,0)
+#undef dma_buf_export
+#define dma_buf_export(priv, ops, size, flags, resv)	\
+	dma_buf_export_named(priv, ops, size, flags, KBUILD_MODNAME)
+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0) */
+
 #endif /* _BACKPORT_DMA_BUF_H__ */
-- 
1.9.1

[PATCH 07/19] backports: add of_node_put()

[Hauke Mehrtens]

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 backport/backport-include/linux/of.h | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/backport/backport-include/linux/of.h b/backport/backport-include/linux/of.h
index c1ce91c..69664de 100644
--- a/backport/backport-include/linux/of.h
+++ b/backport/backport-include/linux/of.h
@@ -94,4 +94,16 @@ static inline int of_property_count_u32_elems(const struct device_node *np,
 }
 #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,15,0) */
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0)
+#ifndef CONFIG_OF
+#define of_node_get LINUX_BACKPORT(of_node_get)
+/* Dummy ref counting routines - to be implemented later */
+static inline struct device_node *of_node_get(struct device_node *node)
+{
+	return node;
+}
+static inline void of_node_put(struct device_node *node) { }
+#endif /* CONFIG_OF */
+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0) */
+
 #endif	/* _COMPAT_LINUX_OF_H */
-- 
1.9.1

[PATCH 08/19] backports: add of_match_ptr()

[Hauke Mehrtens]

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 backport/backport-include/linux/of.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/backport/backport-include/linux/of.h b/backport/backport-include/linux/of.h
index 69664de..f2a8ab4 100644
--- a/backport/backport-include/linux/of.h
+++ b/backport/backport-include/linux/of.h
@@ -106,4 +106,12 @@ static inline void of_node_put(struct device_node *node) { }
 #endif /* CONFIG_OF */
 #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0) */
 
+#ifndef of_match_ptr
+#ifdef CONFIG_OF
+#define of_match_ptr(_ptr)	(_ptr)
+#else
+#define of_match_ptr(_ptr)	NULL
+#endif /* CONFIG_OF */
+#endif /* of_match_ptr */
+
 #endif	/* _COMPAT_LINUX_OF_H */
-- 
1.9.1

[PATCH 09/19] backports: add split_page()

[Hauke Mehrtens]

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 backport/compat/backport-3.10.c | 46 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/backport/compat/backport-3.10.c b/backport/compat/backport-3.10.c
index 9bcb805..e75e52e 100644
--- a/backport/compat/backport-3.10.c
+++ b/backport/compat/backport-3.10.c
@@ -17,6 +17,7 @@
 #include <linux/pci.h>
 #include <linux/pci_regs.h>
 #include <linux/of.h>
+#include <linux/mm.h>
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0))
 #include <linux/init.h>
@@ -232,3 +233,48 @@ int of_property_read_u32_index(const struct device_node *np,
 }
 EXPORT_SYMBOL_GPL(of_property_read_u32_index);
 #endif /* CONFIG_OF */
+
+static inline void set_page_count(struct page *page, int v)
+{
+	atomic_set(&page->_count, v);
+}
+
+/*
+ * Turn a non-refcounted page (->_count == 0) into refcounted with
+ * a count of one.
+ */
+static inline void set_page_refcounted(struct page *page)
+{
+	VM_BUG_ON(PageTail(page));
+	VM_BUG_ON(atomic_read(&page->_count));
+	set_page_count(page, 1);
+}
+
+/*
+ * split_page takes a non-compound higher-order page, and splits it into
+ * n (1<<order) sub-pages: page[0..n]
+ * Each sub-page must be freed individually.
+ *
+ * Note: this is probably too low level an operation for use in drivers.
+ * Please consult with lkml before using this in your driver.
+ */
+void split_page(struct page *page, unsigned int order)
+{
+	int i;
+
+	VM_BUG_ON(PageCompound(page));
+	VM_BUG_ON(!page_count(page));
+
+#ifdef CONFIG_KMEMCHECK
+	/*
+	 * Split shadow pages too, because free(page[0]) would
+	 * otherwise free the whole shadow.
+	 */
+	if (kmemcheck_page_is_tracked(page))
+		split_page(virt_to_page(page[0].shadow), order);
+#endif
+
+	for (i = 1; i < (1 << order); i++)
+		set_page_refcounted(page + i);
+}
+EXPORT_SYMBOL_GPL(split_page);
-- 
1.9.1

[PATCH 10/19] backports: copy include/linux/platform_data/st21nfca.h

[Hauke Mehrtens]

This is needed by the st21nfca nfc 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 d3d4147..c95ea8e 100644
--- a/copy-list
+++ b/copy-list
@@ -128,6 +128,7 @@ include/uapi/linux/nfc.h
 # NFC drivers
 drivers/nfc/
 include/linux/platform_data/pn544.h
+include/linux/platform_data/st21nfca.h
 
 # Regulator
 # we don't include the whole directory as we need
-- 
1.9.1

[PATCH 11/19] backports: remove usage of get_ts_info in cdc_ncm.c

[Hauke Mehrtens]

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 .../network/0017-get_ts_info/cdc_ncm.patch                   | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 patches/collateral-evolutions/network/0017-get_ts_info/cdc_ncm.patch

diff --git a/patches/collateral-evolutions/network/0017-get_ts_info/cdc_ncm.patch b/patches/collateral-evolutions/network/0017-get_ts_info/cdc_ncm.patch
new file mode 100644
index 0000000..14101f2
--- /dev/null
+++ b/patches/collateral-evolutions/network/0017-get_ts_info/cdc_ncm.patch
@@ -0,0 +1,12 @@
+--- a/drivers/net/usb/cdc_ncm.c
++++ b/drivers/net/usb/cdc_ncm.c
+@@ -137,7 +137,9 @@ static const struct ethtool_ops cdc_ncm_
+ 	.get_drvinfo       = usbnet_get_drvinfo,
+ 	.get_msglevel      = usbnet_get_msglevel,
+ 	.set_msglevel      = usbnet_set_msglevel,
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)
+ 	.get_ts_info       = ethtool_op_get_ts_info,
++#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0) */
+ 	.get_sset_count    = cdc_ncm_get_sset_count,
+ 	.get_strings       = cdc_ncm_get_strings,
+ 	.get_ethtool_stats = cdc_ncm_get_ethtool_stats,
-- 
1.9.1

[PATCH 12/19] backports: handle rename of ndo_set_vf_tx_rate to ndo_set_vf_rate

[Hauke Mehrtens]

This member of struct net_device_ops was renamed and the function
signature was also changed a bit.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 .../network/0043-ndo_set_vf_rate/igb.patch         | 78 ++++++++++++++++++++++
 1 file changed, 78 insertions(+)
 create mode 100644 patches/collateral-evolutions/network/0043-ndo_set_vf_rate/igb.patch

diff --git a/patches/collateral-evolutions/network/0043-ndo_set_vf_rate/igb.patch b/patches/collateral-evolutions/network/0043-ndo_set_vf_rate/igb.patch
new file mode 100644
index 0000000..59a22e5
--- /dev/null
+++ b/patches/collateral-evolutions/network/0043-ndo_set_vf_rate/igb.patch
@@ -0,0 +1,78 @@
+--- a/drivers/net/ethernet/intel/igb/igb_main.c
++++ b/drivers/net/ethernet/intel/igb/igb_main.c
+@@ -177,7 +177,11 @@ static void igb_restore_vf_multicasts(st
+ static int igb_ndo_set_vf_mac(struct net_device *netdev, int vf, u8 *mac);
+ static int igb_ndo_set_vf_vlan(struct net_device *netdev,
+ 			       int vf, u16 vlan, u8 qos);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0)
+ static int igb_ndo_set_vf_bw(struct net_device *, int, int, int);
++#else
++static int igb_ndo_set_vf_bw(struct net_device *, int, int);
++#endif
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0)
+ static int igb_ndo_set_vf_spoofchk(struct net_device *netdev, int vf,
+ 				   bool setting);
+@@ -2102,7 +2106,11 @@ static const struct net_device_ops igb_n
+ 	.ndo_vlan_rx_kill_vid	= igb_vlan_rx_kill_vid,
+ 	.ndo_set_vf_mac		= igb_ndo_set_vf_mac,
+ 	.ndo_set_vf_vlan	= igb_ndo_set_vf_vlan,
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0)
+ 	.ndo_set_vf_rate	= igb_ndo_set_vf_bw,
++#else
++	.ndo_set_vf_tx_rate	= igb_ndo_set_vf_bw,
++#endif
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0)
+ 	.ndo_set_vf_spoofchk	= igb_ndo_set_vf_spoofchk,
+ #endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0) */
+@@ -7929,8 +7937,12 @@ static void igb_check_vf_rate_limit(stru
+ 	}
+ }
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0)
+ static int igb_ndo_set_vf_bw(struct net_device *netdev, int vf,
+ 			     int min_tx_rate, int max_tx_rate)
++#else
++static int igb_ndo_set_vf_bw(struct net_device *netdev, int vf, int tx_rate)
++#endif
+ {
+ 	struct igb_adapter *adapter = netdev_priv(netdev);
+ 	struct e1000_hw *hw = &adapter->hw;
+@@ -7939,6 +7951,7 @@ static int igb_ndo_set_vf_bw(struct net_
+ 	if (hw->mac.type != e1000_82576)
+ 		return -EOPNOTSUPP;
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0)
+ 	if (min_tx_rate)
+ 		return -EINVAL;
+ 
+@@ -7952,7 +7965,17 @@ static int igb_ndo_set_vf_bw(struct net_
+ 	adapter->vf_rate_link_speed = actual_link_speed;
+ 	adapter->vf_data[vf].tx_rate = (u16)max_tx_rate;
+ 	igb_set_vf_rate_limit(hw, vf, max_tx_rate, actual_link_speed);
++#else
++	actual_link_speed = igb_link_mbps(adapter->link_speed);
++	if ((vf >= adapter->vfs_allocated_count) ||
++	    (!(rd32(E1000_STATUS) & E1000_STATUS_LU)) ||
++	    (tx_rate < 0) || (tx_rate > actual_link_speed))
++		return -EINVAL;
+ 
++	adapter->vf_rate_link_speed = actual_link_speed;
++	adapter->vf_data[vf].tx_rate = (u16)tx_rate;
++	igb_set_vf_rate_limit(hw, vf, tx_rate, actual_link_speed);
++#endif
+ 	return 0;
+ }
+ 
+@@ -7993,8 +8016,12 @@ static int igb_ndo_get_vf_config(struct
+ 		return -EINVAL;
+ 	ivi->vf = vf;
+ 	memcpy(&ivi->mac, adapter->vf_data[vf].vf_mac_addresses, ETH_ALEN);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0)
+ 	ivi->max_tx_rate = adapter->vf_data[vf].tx_rate;
+ 	ivi->min_tx_rate = 0;
++#else
++	ivi->tx_rate = adapter->vf_data[vf].tx_rate;
++#endif
+ 	ivi->vlan = adapter->vf_data[vf].pf_vlan;
+ 	ivi->qos = adapter->vf_data[vf].pf_qos;
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0)
-- 
1.9.1

[PATCH 13/19] backports: do not access user_ns on struct net

[Hauke Mehrtens]

The ieee802154 subsystem wants to access user_ns on struct net, but
this member was added in kernel 3.8, check the general capabilities
instead.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 .../0044-no_user_ns_in_net/ieee802154.patch        | 30 ++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 patches/collateral-evolutions/network/0044-no_user_ns_in_net/ieee802154.patch

diff --git a/patches/collateral-evolutions/network/0044-no_user_ns_in_net/ieee802154.patch b/patches/collateral-evolutions/network/0044-no_user_ns_in_net/ieee802154.patch
new file mode 100644
index 0000000..d5f951b
--- /dev/null
+++ b/patches/collateral-evolutions/network/0044-no_user_ns_in_net/ieee802154.patch
@@ -0,0 +1,30 @@
+--- a/net/ieee802154/dgram.c
++++ b/net/ieee802154/dgram.c
+@@ -483,8 +483,13 @@ static int dgram_setsockopt(struct sock
+ 		ro->want_ack = !!val;
+ 		break;
+ 	case WPAN_SECURITY:
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)
+ 		if (!ns_capable(net->user_ns, CAP_NET_ADMIN) &&
+ 		    !ns_capable(net->user_ns, CAP_NET_RAW)) {
++#else
++		if (!capable(CAP_NET_ADMIN) &&
++		    !capable(CAP_NET_RAW)) {
++#endif
+ 			err = -EPERM;
+ 			break;
+ 		}
+@@ -507,8 +512,13 @@ static int dgram_setsockopt(struct sock
+ 		}
+ 		break;
+ 	case WPAN_SECURITY_LEVEL:
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)
+ 		if (!ns_capable(net->user_ns, CAP_NET_ADMIN) &&
+ 		    !ns_capable(net->user_ns, CAP_NET_RAW)) {
++#else
++		if (!capable(CAP_NET_ADMIN) &&
++		    !capable(CAP_NET_RAW)) {
++#endif
+ 			err = -EPERM;
+ 			break;
+ 		}
-- 
1.9.1

[PATCH 14/19] backports: remove const from pci error handlers on kernel < 3.7

[Hauke Mehrtens]

This fixes a warning on these older kernel versions.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 .../network/0042-pci_error_handlers/alx.patch              | 14 ++++++++++++++
 .../network/0042-pci_error_handlers/atl1c.patch            | 14 ++++++++++++++
 .../network/0042-pci_error_handlers/atl1e.patch            | 14 ++++++++++++++
 .../network/0042-pci_error_handlers/ngene.patch            | 14 ++++++++++++++
 4 files changed, 56 insertions(+)
 create mode 100644 patches/collateral-evolutions/network/0042-pci_error_handlers/alx.patch
 create mode 100644 patches/collateral-evolutions/network/0042-pci_error_handlers/atl1c.patch
 create mode 100644 patches/collateral-evolutions/network/0042-pci_error_handlers/atl1e.patch
 create mode 100644 patches/collateral-evolutions/network/0042-pci_error_handlers/ngene.patch

diff --git a/patches/collateral-evolutions/network/0042-pci_error_handlers/alx.patch b/patches/collateral-evolutions/network/0042-pci_error_handlers/alx.patch
new file mode 100644
index 0000000..c26efa2
--- /dev/null
+++ b/patches/collateral-evolutions/network/0042-pci_error_handlers/alx.patch
@@ -0,0 +1,14 @@
+--- a/drivers/net/ethernet/atheros/alx/main.c
++++ b/drivers/net/ethernet/atheros/alx/main.c
+@@ -1521,7 +1521,11 @@ static void alx_pci_error_resume(struct
+ 	rtnl_unlock();
+ }
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)
+ static const struct pci_error_handlers alx_err_handlers = {
++#else
++static struct pci_error_handlers alx_err_handlers = {
++#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0) */
+ 	.error_detected = alx_pci_error_detected,
+ 	.slot_reset     = alx_pci_error_slot_reset,
+ 	.resume         = alx_pci_error_resume,
diff --git a/patches/collateral-evolutions/network/0042-pci_error_handlers/atl1c.patch b/patches/collateral-evolutions/network/0042-pci_error_handlers/atl1c.patch
new file mode 100644
index 0000000..239d1b9
--- /dev/null
+++ b/patches/collateral-evolutions/network/0042-pci_error_handlers/atl1c.patch
@@ -0,0 +1,14 @@
+--- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
++++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
+@@ -2782,7 +2782,11 @@ static void atl1c_io_resume(struct pci_d
+ 	netif_device_attach(netdev);
+ }
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)
+ static const struct pci_error_handlers atl1c_err_handler = {
++#else
++static struct pci_error_handlers atl1c_err_handler = {
++#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0) */
+ 	.error_detected = atl1c_io_error_detected,
+ 	.slot_reset = atl1c_io_slot_reset,
+ 	.resume = atl1c_io_resume,
diff --git a/patches/collateral-evolutions/network/0042-pci_error_handlers/atl1e.patch b/patches/collateral-evolutions/network/0042-pci_error_handlers/atl1e.patch
new file mode 100644
index 0000000..3ef2f93
--- /dev/null
+++ b/patches/collateral-evolutions/network/0042-pci_error_handlers/atl1e.patch
@@ -0,0 +1,14 @@
+--- a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
++++ b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
+@@ -2559,7 +2559,11 @@ static void atl1e_io_resume(struct pci_d
+ 	netif_device_attach(netdev);
+ }
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)
+ static const struct pci_error_handlers atl1e_err_handler = {
++#else
++static struct pci_error_handlers atl1e_err_handler = {
++#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0) */
+ 	.error_detected = atl1e_io_error_detected,
+ 	.slot_reset = atl1e_io_slot_reset,
+ 	.resume = atl1e_io_resume,
diff --git a/patches/collateral-evolutions/network/0042-pci_error_handlers/ngene.patch b/patches/collateral-evolutions/network/0042-pci_error_handlers/ngene.patch
new file mode 100644
index 0000000..620dbbe
--- /dev/null
+++ b/patches/collateral-evolutions/network/0042-pci_error_handlers/ngene.patch
@@ -0,0 +1,14 @@
+--- a/drivers/media/pci/ngene/ngene-cards.c
++++ b/drivers/media/pci/ngene/ngene-cards.c
+@@ -798,7 +798,11 @@ static void ngene_resume(struct pci_dev
+ 	printk(KERN_INFO DEVICE_NAME ": resume\n");
+ }
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)
+ static const struct pci_error_handlers ngene_errors = {
++#else
++static struct pci_error_handlers ngene_errors = {
++#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0) */
+ 	.error_detected = ngene_error_detected,
+ 	.link_reset = ngene_link_reset,
+ 	.slot_reset = ngene_slot_reset,
-- 
1.9.1

[PATCH 15/19] backports: add hashtable.h

[Hauke Mehrtens]

This header file is used by net/mac802154/llsec.h and does not provide
any function prototype so it is save to copy it.

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 c95ea8e..7ad8972 100644
--- a/copy-list
+++ b/copy-list
@@ -13,6 +13,7 @@
 COPYING
 MAINTAINERS
 include/linux/unaligned/
+include/linux/hashtable.h
 
 # 802.11
 drivers/net/wireless/Kconfig
-- 
1.9.1

[PATCH 16/19] backports: make some regulator drivers depend on more recent kernel versions

[Hauke Mehrtens]

These drivers got new and not so easy backportable dependencies.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 dependencies | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dependencies b/dependencies
index 6ee37ec..b4b68bd 100644
--- a/dependencies
+++ b/dependencies
@@ -22,6 +22,7 @@ REGULATOR_ACT8865 3.12
 REGULATOR_AD5398 3.5
 REGULATOR_ARIZONA 3.16
 REGULATOR_AS3711 3.12
+REGULATOR_BCM590XX 3.16
 REGULATOR_DA903X 3.12
 REGULATOR_DA9052 3.9
 REGULATOR_DA9055 3.8
@@ -34,6 +35,7 @@ REGULATOR_LP3971 3.6
 REGULATOR_LP3972 3.6
 REGULATOR_LP872X 3.6
 REGULATOR_LP8755 3.6
+REGULATOR_LTC3589 3.13
 REGULATOR_MAX1586 3.6
 REGULATOR_MAX77686 3.7
 REGULATOR_MAX77693 3.11
@@ -73,7 +75,7 @@ REGULATOR_TPS65090 3.16
 # other mfd drivers / platform code can depend on, skip
 REGULATOR_TPS65217 3.15
 REGULATOR_TPS6524X 3.6
-REGULATOR_TPS6586X 3.14
+REGULATOR_TPS6586X 3.16
 REGULATOR_TPS65910 3.14
 REGULATOR_TPS65912 3.12
 REGULATOR_TWL4030 3.11
-- 
1.9.1

[PATCH 17/19] backports: activate NFC_TRF7970A on kernel 3.4

[Hauke Mehrtens]

The function devm_gpio_request_one() was backported some time ago.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 dependencies | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/dependencies b/dependencies
index b4b68bd..2888bec 100644
--- a/dependencies
+++ b/dependencies
@@ -122,10 +122,7 @@ REGULATOR_AB3100 3.9
 # only introduced in kernel 3.1
 NFC 3.1
 
-# requires devm_gpio_request_one() added but since
-# gpio infrastructure has been strongly shuffled around
-# we require drivers to use the in-kernel gptio infrastructure
-NFC_TRF7970A 3.5
+NFC_TRF7970A 3.4
 
 INTEL_IPS 3.2
 
-- 
1.9.1

[PATCH 18/19] backports: remove useless git patch header

[Hauke Mehrtens]

When exporting a patch from git it adds a header to it, but this header
is not needed by backports, remove it from the patches.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 .../network/0017-get_ts_info/igb_get_ts_info.patch                      | 2 --
 patches/collateral-evolutions/network/0028-select_queue/mac80211.patch  | 2 --
 patches/collateral-evolutions/network/0028-select_queue/mwifiex.patch   | 2 --
 .../network/0032-sriov_configure/igb_sriov_configure.patch              | 2 --
 .../collateral-evolutions/network/0033-ndo_vlan_rx_vid/cdc_mbim.patch   | 2 --
 .../network/0033-ndo_vlan_rx_vid/igb_ndo_vlan_rx_vid.patch              | 2 --
 .../network/0034-ndo_set_vf_spoofchk/igb_ndo_set_vf_spoofchk.patch      | 2 --
 .../collateral-evolutions/network/0035-skb_no_fcs/igb_skb_no_fcs.patch  | 2 --
 .../network/0036-ethtool_eee/igb_ethtool_eee.patch                      | 2 --
 .../network/0037-ethtool_get_module/igb_get_module.patch                | 2 --
 .../network/0038-ethtool_rxfh_indir/igb_rxfh_indir.patch                | 2 --
 .../collateral-evolutions/network/0039-ethtool_rxnfc/igb_rxnfc.patch    | 2 --
 .../network/0040-ethtool_cmd_mdix/igb_ethtool_cmd_mdix.patch            | 2 --
 .../igb-devm_hwmon_device_register_with_groups.patch                    | 2 --
 .../network/0042-pci_error_handlers/igb_pci_error_handlers.patch        | 2 --
 15 files changed, 30 deletions(-)

diff --git a/patches/collateral-evolutions/network/0017-get_ts_info/igb_get_ts_info.patch b/patches/collateral-evolutions/network/0017-get_ts_info/igb_get_ts_info.patch
index 38f11f5..0b978c9 100644
--- a/patches/collateral-evolutions/network/0017-get_ts_info/igb_get_ts_info.patch
+++ b/patches/collateral-evolutions/network/0017-get_ts_info/igb_get_ts_info.patch
@@ -1,5 +1,3 @@
-diff --git a/drivers/net/ethernet/intel/igb/igb_ethtool.c b/drivers/net/ethernet/intel/igb/igb_ethtool.c
-index 7c8b9bf..75606be 100644
 --- a/drivers/net/ethernet/intel/igb/igb_ethtool.c
 +++ b/drivers/net/ethernet/intel/igb/igb_ethtool.c
 @@ -2350,6 +2350,7 @@ static void igb_get_strings(struct net_d
diff --git a/patches/collateral-evolutions/network/0028-select_queue/mac80211.patch b/patches/collateral-evolutions/network/0028-select_queue/mac80211.patch
index 77d3e2f..2290203 100644
--- a/patches/collateral-evolutions/network/0028-select_queue/mac80211.patch
+++ b/patches/collateral-evolutions/network/0028-select_queue/mac80211.patch
@@ -1,5 +1,3 @@
-diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
-index 088111a..dcf149a 100644
 --- a/net/mac80211/iface.c
 +++ b/net/mac80211/iface.c
 @@ -1063,10 +1063,19 @@ static void ieee80211_uninit(struct net_
diff --git a/patches/collateral-evolutions/network/0028-select_queue/mwifiex.patch b/patches/collateral-evolutions/network/0028-select_queue/mwifiex.patch
index 7391bdd..f722292 100644
--- a/patches/collateral-evolutions/network/0028-select_queue/mwifiex.patch
+++ b/patches/collateral-evolutions/network/0028-select_queue/mwifiex.patch
@@ -1,5 +1,3 @@
-diff --git a/drivers/net/wireless/mwifiex/main.c b/drivers/net/wireless/mwifiex/main.c
-index 9d3d275..f8b16f4 100644
 --- a/drivers/net/wireless/mwifiex/main.c
 +++ b/drivers/net/wireless/mwifiex/main.c
 @@ -745,9 +745,18 @@ static struct net_device_stats *mwifiex_
diff --git a/patches/collateral-evolutions/network/0032-sriov_configure/igb_sriov_configure.patch b/patches/collateral-evolutions/network/0032-sriov_configure/igb_sriov_configure.patch
index 3453e74..5b81354 100644
--- a/patches/collateral-evolutions/network/0032-sriov_configure/igb_sriov_configure.patch
+++ b/patches/collateral-evolutions/network/0032-sriov_configure/igb_sriov_configure.patch
@@ -1,5 +1,3 @@
-diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
-index 0270da9..09564d0 100644
 --- a/drivers/net/ethernet/intel/igb/igb_main.c
 +++ b/drivers/net/ethernet/intel/igb/igb_main.c
 @@ -198,7 +198,9 @@ static const struct dev_pm_ops igb_pm_op
diff --git a/patches/collateral-evolutions/network/0033-ndo_vlan_rx_vid/cdc_mbim.patch b/patches/collateral-evolutions/network/0033-ndo_vlan_rx_vid/cdc_mbim.patch
index de3ad1d..362b544 100644
--- a/patches/collateral-evolutions/network/0033-ndo_vlan_rx_vid/cdc_mbim.patch
+++ b/patches/collateral-evolutions/network/0033-ndo_vlan_rx_vid/cdc_mbim.patch
@@ -1,5 +1,3 @@
-diff --git a/drivers/net/usb/cdc_mbim.c b/drivers/net/usb/cdc_mbim.c
-index bc23273..459730d 100644
 --- a/drivers/net/usb/cdc_mbim.c
 +++ b/drivers/net/usb/cdc_mbim.c
 @@ -70,7 +70,13 @@ static int cdc_mbim_wdm_manage_power(str
diff --git a/patches/collateral-evolutions/network/0033-ndo_vlan_rx_vid/igb_ndo_vlan_rx_vid.patch b/patches/collateral-evolutions/network/0033-ndo_vlan_rx_vid/igb_ndo_vlan_rx_vid.patch
index adb2d97..fe31809 100644
--- a/patches/collateral-evolutions/network/0033-ndo_vlan_rx_vid/igb_ndo_vlan_rx_vid.patch
+++ b/patches/collateral-evolutions/network/0033-ndo_vlan_rx_vid/igb_ndo_vlan_rx_vid.patch
@@ -1,5 +1,3 @@
-diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
-index 09564d0..325f244 100644
 --- a/drivers/net/ethernet/intel/igb/igb_main.c
 +++ b/drivers/net/ethernet/intel/igb/igb_main.c
 @@ -157,8 +157,16 @@ static void igb_tx_timeout(struct net_de
diff --git a/patches/collateral-evolutions/network/0034-ndo_set_vf_spoofchk/igb_ndo_set_vf_spoofchk.patch b/patches/collateral-evolutions/network/0034-ndo_set_vf_spoofchk/igb_ndo_set_vf_spoofchk.patch
index 1e6eda5..9b83f5f 100644
--- a/patches/collateral-evolutions/network/0034-ndo_set_vf_spoofchk/igb_ndo_set_vf_spoofchk.patch
+++ b/patches/collateral-evolutions/network/0034-ndo_set_vf_spoofchk/igb_ndo_set_vf_spoofchk.patch
@@ -1,5 +1,3 @@
-diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
-index 325f244..ccd8f36 100644
 --- a/drivers/net/ethernet/intel/igb/igb_main.c
 +++ b/drivers/net/ethernet/intel/igb/igb_main.c
 @@ -178,8 +178,10 @@ static int igb_ndo_set_vf_mac(struct net
diff --git a/patches/collateral-evolutions/network/0035-skb_no_fcs/igb_skb_no_fcs.patch b/patches/collateral-evolutions/network/0035-skb_no_fcs/igb_skb_no_fcs.patch
index e0c54ce..691c1bc 100644
--- a/patches/collateral-evolutions/network/0035-skb_no_fcs/igb_skb_no_fcs.patch
+++ b/patches/collateral-evolutions/network/0035-skb_no_fcs/igb_skb_no_fcs.patch
@@ -1,5 +1,3 @@
-diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
-index ccd8f36..132cef8 100644
 --- a/drivers/net/ethernet/intel/igb/igb_main.c
 +++ b/drivers/net/ethernet/intel/igb/igb_main.c
 @@ -4768,9 +4768,10 @@ static u32 igb_tx_cmd_type(struct sk_buf
diff --git a/patches/collateral-evolutions/network/0036-ethtool_eee/igb_ethtool_eee.patch b/patches/collateral-evolutions/network/0036-ethtool_eee/igb_ethtool_eee.patch
index 8663c39..c737c98 100644
--- a/patches/collateral-evolutions/network/0036-ethtool_eee/igb_ethtool_eee.patch
+++ b/patches/collateral-evolutions/network/0036-ethtool_eee/igb_ethtool_eee.patch
@@ -1,5 +1,3 @@
-diff --git a/drivers/net/ethernet/intel/igb/igb_ethtool.c b/drivers/net/ethernet/intel/igb/igb_ethtool.c
-index 333a2b0..7c8b9bf 100644
 --- a/drivers/net/ethernet/intel/igb/igb_ethtool.c
 +++ b/drivers/net/ethernet/intel/igb/igb_ethtool.c
 @@ -2591,6 +2591,7 @@ static int igb_set_rxnfc(struct net_devi
diff --git a/patches/collateral-evolutions/network/0037-ethtool_get_module/igb_get_module.patch b/patches/collateral-evolutions/network/0037-ethtool_get_module/igb_get_module.patch
index 4c2f181..a703f62 100644
--- a/patches/collateral-evolutions/network/0037-ethtool_get_module/igb_get_module.patch
+++ b/patches/collateral-evolutions/network/0037-ethtool_get_module/igb_get_module.patch
@@ -1,5 +1,3 @@
-diff --git a/drivers/net/ethernet/intel/igb/igb_ethtool.c b/drivers/net/ethernet/intel/igb/igb_ethtool.c
-index 75606be..6662b3b 100644
 --- a/drivers/net/ethernet/intel/igb/igb_ethtool.c
 +++ b/drivers/net/ethernet/intel/igb/igb_ethtool.c
 @@ -2735,6 +2735,7 @@ static int igb_set_eee(struct net_device
diff --git a/patches/collateral-evolutions/network/0038-ethtool_rxfh_indir/igb_rxfh_indir.patch b/patches/collateral-evolutions/network/0038-ethtool_rxfh_indir/igb_rxfh_indir.patch
index 9568482..75b9e61 100644
--- a/patches/collateral-evolutions/network/0038-ethtool_rxfh_indir/igb_rxfh_indir.patch
+++ b/patches/collateral-evolutions/network/0038-ethtool_rxfh_indir/igb_rxfh_indir.patch
@@ -1,5 +1,3 @@
-diff --git a/drivers/net/ethernet/intel/igb/igb_ethtool.c b/drivers/net/ethernet/intel/igb/igb_ethtool.c
-index 6662b3b..03fe81a 100644
 --- a/drivers/net/ethernet/intel/igb/igb_ethtool.c
 +++ b/drivers/net/ethernet/intel/igb/igb_ethtool.c
 @@ -2831,6 +2831,7 @@ static void igb_ethtool_complete(struct
diff --git a/patches/collateral-evolutions/network/0039-ethtool_rxnfc/igb_rxnfc.patch b/patches/collateral-evolutions/network/0039-ethtool_rxnfc/igb_rxnfc.patch
index daec82c..ed435d9 100644
--- a/patches/collateral-evolutions/network/0039-ethtool_rxnfc/igb_rxnfc.patch
+++ b/patches/collateral-evolutions/network/0039-ethtool_rxnfc/igb_rxnfc.patch
@@ -1,5 +1,3 @@
-diff --git a/drivers/net/ethernet/intel/igb/igb_ethtool.c b/drivers/net/ethernet/intel/igb/igb_ethtool.c
-index 03fe81a..f561b7b 100644
 --- a/drivers/net/ethernet/intel/igb/igb_ethtool.c
 +++ b/drivers/net/ethernet/intel/igb/igb_ethtool.c
 @@ -2450,8 +2450,13 @@ static int igb_get_rss_hash_opts(struct
diff --git a/patches/collateral-evolutions/network/0040-ethtool_cmd_mdix/igb_ethtool_cmd_mdix.patch b/patches/collateral-evolutions/network/0040-ethtool_cmd_mdix/igb_ethtool_cmd_mdix.patch
index 5b4713d..d21f7f9 100644
--- a/patches/collateral-evolutions/network/0040-ethtool_cmd_mdix/igb_ethtool_cmd_mdix.patch
+++ b/patches/collateral-evolutions/network/0040-ethtool_cmd_mdix/igb_ethtool_cmd_mdix.patch
@@ -1,5 +1,3 @@
-diff --git a/drivers/net/ethernet/intel/igb/igb_ethtool.c b/drivers/net/ethernet/intel/igb/igb_ethtool.c
-index f561b7b..b611f5b 100644
 --- a/drivers/net/ethernet/intel/igb/igb_ethtool.c
 +++ b/drivers/net/ethernet/intel/igb/igb_ethtool.c
 @@ -245,10 +245,12 @@ static int igb_get_settings(struct net_d
diff --git a/patches/collateral-evolutions/network/0041-devm_hwmon_device_register_with_groups/igb-devm_hwmon_device_register_with_groups.patch b/patches/collateral-evolutions/network/0041-devm_hwmon_device_register_with_groups/igb-devm_hwmon_device_register_with_groups.patch
index 057dc28..cd83953 100644
--- a/patches/collateral-evolutions/network/0041-devm_hwmon_device_register_with_groups/igb-devm_hwmon_device_register_with_groups.patch
+++ b/patches/collateral-evolutions/network/0041-devm_hwmon_device_register_with_groups/igb-devm_hwmon_device_register_with_groups.patch
@@ -1,5 +1,3 @@
-diff --git a/drivers/net/ethernet/intel/igb/igb_hwmon.c b/drivers/net/ethernet/intel/igb/igb_hwmon.c
-index 2eee9bb..ad08b1f 100644
 --- a/drivers/net/ethernet/intel/igb/igb_hwmon.c
 +++ b/drivers/net/ethernet/intel/igb/igb_hwmon.c
 @@ -173,7 +173,9 @@ int igb_sysfs_init(struct igb_adapter *a
diff --git a/patches/collateral-evolutions/network/0042-pci_error_handlers/igb_pci_error_handlers.patch b/patches/collateral-evolutions/network/0042-pci_error_handlers/igb_pci_error_handlers.patch
index 06af19b..4f99a2b 100644
--- a/patches/collateral-evolutions/network/0042-pci_error_handlers/igb_pci_error_handlers.patch
+++ b/patches/collateral-evolutions/network/0042-pci_error_handlers/igb_pci_error_handlers.patch
@@ -1,5 +1,3 @@
-diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
-index 132cef8..0e616a7 100644
 --- a/drivers/net/ethernet/intel/igb/igb_main.c
 +++ b/drivers/net/ethernet/intel/igb/igb_main.c
 @@ -234,7 +234,11 @@ static pci_ers_result_t igb_io_error_det
-- 
1.9.1

[PATCH 19/19] backports: refresh patches on next-20140606

[Hauke Mehrtens]

There were manual changes ineeded in the following files:
patches/collateral-evolutions/network/0034-ndo_set_vf_spoofchk/igb_ndo_set_vf_spoofchk.patch
patches/collateral-evolutions/network/0037-ethtool_get_module/igb_get_module.patch
patches/collateral-evolutions/network/0038-ethtool_rxfh_indir/igb_rxfh_indir.patch

1   3.0.101             [  OK  ]
2   3.1.10              [  OK  ]
3   3.2.59              [  OK  ]
4   3.3.8               [  OK  ]
5   3.4.91              [  OK  ]
6   3.5.7               [  OK  ]
7   3.6.11              [  OK  ]
8   3.7.10              [  OK  ]
9   3.8.13              [  OK  ]
10  3.9.11              [  OK  ]
11  3.10.40             [  OK  ]
12  3.11.10             [  OK  ]
13  3.12.20             [  OK  ]
14  3.13.11             [  OK  ]
15  3.14.4              [  OK  ]
16  3.15-rc7            [  OK  ]

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 .../media/0002-no_dmabuf/v4l2.patch                | 24 +++++++-------
 .../0002-disable-dump-adjust-on-old-kernels.patch  |  4 +--
 .../include_net_cfg80211.patch                     |  2 +-
 .../net_wireless_core.patch                        |  2 +-
 .../net_wireless_core.patch                        |  4 +--
 .../0014-netlink_seq/net_wireless_nl80211.patch    |  2 +-
 .../network/0017-get_ts_info/igb_get_ts_info.patch |  2 +-
 .../network/0024-led-blink-api/mac80211.patch      |  2 +-
 .../network/0027-genl-const/ieee802154.patch       |  4 +--
 .../network/0027-genl-const/nl80211.patch          |  6 ++--
 .../network/0028-select_queue/mac80211.patch       |  4 +--
 .../0032-sriov_configure/igb_sriov_configure.patch |  8 ++---
 .../0033-ndo_vlan_rx_vid/igb_ndo_vlan_rx_vid.patch |  8 ++---
 .../igb_ndo_set_vf_spoofchk.patch                  | 12 +++----
 .../network/0035-skb_no_fcs/igb_skb_no_fcs.patch   |  2 +-
 .../network/0036-ethtool_eee/igb_ethtool_eee.patch |  2 +-
 .../0037-ethtool_get_module/igb_get_module.patch   |  6 ++--
 .../0038-ethtool_rxfh_indir/igb_rxfh_indir.patch   | 38 +++++++++++++++++-----
 18 files changed, 76 insertions(+), 56 deletions(-)

diff --git a/patches/collateral-evolutions/media/0002-no_dmabuf/v4l2.patch b/patches/collateral-evolutions/media/0002-no_dmabuf/v4l2.patch
index a535c2d..218dc25 100644
--- a/patches/collateral-evolutions/media/0002-no_dmabuf/v4l2.patch
+++ b/patches/collateral-evolutions/media/0002-no_dmabuf/v4l2.patch
@@ -117,7 +117,7 @@
  
  	/*
  	 * Place the busy tests at the end: -EBUSY can be ignored when
-@@ -1421,6 +1429,7 @@ err:
+@@ -1445,6 +1453,7 @@ err:
  	return ret;
  }
  
@@ -125,7 +125,7 @@
  /**
   * __qbuf_dmabuf() - handle qbuf of a DMABUF buffer
   */
-@@ -1538,6 +1547,7 @@ err:
+@@ -1562,6 +1571,7 @@ err:
  
  	return ret;
  }
@@ -133,7 +133,7 @@
  
  /**
   * __enqueue_in_driver() - enqueue a vb2_buffer in driver for processing
-@@ -1613,9 +1623,11 @@ static int __buf_prepare(struct vb2_buff
+@@ -1637,9 +1647,11 @@ static int __buf_prepare(struct vb2_buff
  
  		up_read(mmap_sem);
  		break;
@@ -145,7 +145,7 @@
  	default:
  		WARN(1, "Invalid queue type\n");
  		ret = -EINVAL;
-@@ -1980,8 +1992,10 @@ EXPORT_SYMBOL_GPL(vb2_wait_for_all_buffe
+@@ -2004,8 +2016,10 @@ EXPORT_SYMBOL_GPL(vb2_wait_for_all_buffe
   */
  static void __vb2_dqbuf(struct vb2_buffer *vb)
  {
@@ -156,7 +156,7 @@
  
  	/* nothing to do if the buffer is already dequeued */
  	if (vb->state == VB2_BUF_STATE_DEQUEUED)
-@@ -1989,6 +2003,7 @@ static void __vb2_dqbuf(struct vb2_buffe
+@@ -2013,6 +2027,7 @@ static void __vb2_dqbuf(struct vb2_buffe
  
  	vb->state = VB2_BUF_STATE_DEQUEUED;
  
@@ -164,7 +164,7 @@
  	/* unmap DMABUF buffer */
  	if (q->memory == V4L2_MEMORY_DMABUF)
  		for (i = 0; i < vb->num_planes; ++i) {
-@@ -1997,6 +2012,7 @@ static void __vb2_dqbuf(struct vb2_buffe
+@@ -2021,6 +2036,7 @@ static void __vb2_dqbuf(struct vb2_buffe
  			call_void_memop(vb, unmap_dmabuf, vb->planes[i].mem_priv);
  			vb->planes[i].dbuf_mapped = 0;
  		}
@@ -172,7 +172,7 @@
  }
  
  static int vb2_internal_dqbuf(struct vb2_queue *q, struct v4l2_buffer *b, bool nonblocking)
-@@ -2277,6 +2293,7 @@ static int __find_plane_by_offset(struct
+@@ -2298,6 +2314,7 @@ static int __find_plane_by_offset(struct
  	return -EINVAL;
  }
  
@@ -180,7 +180,7 @@
  /**
   * vb2_expbuf() - Export a buffer as a file descriptor
   * @q:		videobuf2 queue
-@@ -2354,6 +2371,7 @@ int vb2_expbuf(struct vb2_queue *q, stru
+@@ -2375,6 +2392,7 @@ int vb2_expbuf(struct vb2_queue *q, stru
  	return 0;
  }
  EXPORT_SYMBOL_GPL(vb2_expbuf);
@@ -188,7 +188,7 @@
  
  /**
   * vb2_mmap() - map video buffers into application address space
-@@ -3269,6 +3287,7 @@ int vb2_ioctl_streamoff(struct file *fil
+@@ -3290,6 +3308,7 @@ int vb2_ioctl_streamoff(struct file *fil
  }
  EXPORT_SYMBOL_GPL(vb2_ioctl_streamoff);
  
@@ -196,7 +196,7 @@
  int vb2_ioctl_expbuf(struct file *file, void *priv, struct v4l2_exportbuffer *p)
  {
  	struct video_device *vdev = video_devdata(file);
-@@ -3278,6 +3297,7 @@ int vb2_ioctl_expbuf(struct file *file,
+@@ -3299,6 +3318,7 @@ int vb2_ioctl_expbuf(struct file *file,
  	return vb2_expbuf(vdev->queue, p);
  }
  EXPORT_SYMBOL_GPL(vb2_ioctl_expbuf);
@@ -352,7 +352,7 @@
  
  	void		*(*vaddr)(void *buf_priv);
  	void		*(*cookie)(void *buf_priv);
-@@ -445,7 +449,9 @@ int __must_check vb2_queue_init(struct v
+@@ -446,7 +450,9 @@ int __must_check vb2_queue_init(struct v
  void vb2_queue_release(struct vb2_queue *q);
  
  int vb2_qbuf(struct vb2_queue *q, struct v4l2_buffer *b);
@@ -362,7 +362,7 @@
  int vb2_dqbuf(struct vb2_queue *q, struct v4l2_buffer *b, bool nonblocking);
  
  int vb2_streamon(struct vb2_queue *q, enum v4l2_buf_type type);
-@@ -601,8 +607,10 @@ int vb2_ioctl_qbuf(struct file *file, vo
+@@ -602,8 +608,10 @@ int vb2_ioctl_qbuf(struct file *file, vo
  int vb2_ioctl_dqbuf(struct file *file, void *priv, struct v4l2_buffer *p);
  int vb2_ioctl_streamon(struct file *file, void *priv, enum v4l2_buf_type i);
  int vb2_ioctl_streamoff(struct file *file, void *priv, enum v4l2_buf_type i);
diff --git a/patches/collateral-evolutions/network/0002-disable-dump-adjust-on-old-kernels.patch b/patches/collateral-evolutions/network/0002-disable-dump-adjust-on-old-kernels.patch
index 84a6a9a..16124fc 100644
--- a/patches/collateral-evolutions/network/0002-disable-dump-adjust-on-old-kernels.patch
+++ b/patches/collateral-evolutions/network/0002-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
-@@ -1751,6 +1751,7 @@ static int nl80211_dump_wiphy(struct sk_
+@@ -1767,6 +1767,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
-@@ -1772,6 +1773,7 @@ static int nl80211_dump_wiphy(struct sk_
+@@ -1788,6 +1789,7 @@ static int nl80211_dump_wiphy(struct sk_
  					rtnl_unlock();
  					return 1;
  				}
diff --git a/patches/collateral-evolutions/network/0003-cfg80211-wext-padding/include_net_cfg80211.patch b/patches/collateral-evolutions/network/0003-cfg80211-wext-padding/include_net_cfg80211.patch
index d2e7bdd..589009e 100644
--- a/patches/collateral-evolutions/network/0003-cfg80211-wext-padding/include_net_cfg80211.patch
+++ b/patches/collateral-evolutions/network/0003-cfg80211-wext-padding/include_net_cfg80211.patch
@@ -1,6 +1,6 @@
 --- a/include/net/cfg80211.h
 +++ b/include/net/cfg80211.h
-@@ -2929,6 +2929,9 @@ struct wiphy_vendor_command {
+@@ -2971,6 +2971,9 @@ struct wiphy_vendor_command {
  struct wiphy {
  	/* assign these fields before you register the wiphy */
  
diff --git a/patches/collateral-evolutions/network/0003-cfg80211-wext-padding/net_wireless_core.patch b/patches/collateral-evolutions/network/0003-cfg80211-wext-padding/net_wireless_core.patch
index c585c51..051401a 100644
--- a/patches/collateral-evolutions/network/0003-cfg80211-wext-padding/net_wireless_core.patch
+++ b/patches/collateral-evolutions/network/0003-cfg80211-wext-padding/net_wireless_core.patch
@@ -1,6 +1,6 @@
 --- a/net/wireless/core.c
 +++ b/net/wireless/core.c
-@@ -308,6 +308,17 @@ struct wiphy *wiphy_new(const struct cfg
+@@ -316,6 +316,17 @@ struct wiphy *wiphy_new(const struct cfg
  	struct cfg80211_registered_device *rdev;
  	int alloc_size;
  
diff --git a/patches/collateral-evolutions/network/0010-add-wext-handlers-to-netdev/net_wireless_core.patch b/patches/collateral-evolutions/network/0010-add-wext-handlers-to-netdev/net_wireless_core.patch
index 811f94b..d1015c1 100644
--- a/patches/collateral-evolutions/network/0010-add-wext-handlers-to-netdev/net_wireless_core.patch
+++ b/patches/collateral-evolutions/network/0010-add-wext-handlers-to-netdev/net_wireless_core.patch
@@ -1,6 +1,6 @@
 --- a/net/wireless/core.c
 +++ b/net/wireless/core.c
-@@ -360,10 +360,6 @@ struct wiphy *wiphy_new(const struct cfg
+@@ -368,10 +368,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;
-@@ -884,6 +880,15 @@ static int cfg80211_netdev_notifier_call
+@@ -926,6 +922,15 @@ static int cfg80211_netdev_notifier_call
  		}
  		wdev->netdev = dev;
  #ifdef CONFIG_CFG80211_WEXT
diff --git a/patches/collateral-evolutions/network/0014-netlink_seq/net_wireless_nl80211.patch b/patches/collateral-evolutions/network/0014-netlink_seq/net_wireless_nl80211.patch
index cfcc156..748e1ab 100644
--- a/patches/collateral-evolutions/network/0014-netlink_seq/net_wireless_nl80211.patch
+++ b/patches/collateral-evolutions/network/0014-netlink_seq/net_wireless_nl80211.patch
@@ -1,6 +1,6 @@
 --- a/net/wireless/nl80211.c
 +++ b/net/wireless/nl80211.c
-@@ -6108,7 +6108,9 @@ static int nl80211_dump_scan(struct sk_b
+@@ -6159,7 +6159,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/0017-get_ts_info/igb_get_ts_info.patch b/patches/collateral-evolutions/network/0017-get_ts_info/igb_get_ts_info.patch
index 0b978c9..551d368 100644
--- a/patches/collateral-evolutions/network/0017-get_ts_info/igb_get_ts_info.patch
+++ b/patches/collateral-evolutions/network/0017-get_ts_info/igb_get_ts_info.patch
@@ -16,7 +16,7 @@
  
  static int igb_get_rss_hash_opts(struct igb_adapter *adapter,
  				 struct ethtool_rxnfc *cmd)
-@@ -3017,7 +3019,9 @@ static const struct ethtool_ops igb_etht
+@@ -3018,7 +3020,9 @@ static const struct ethtool_ops igb_etht
  	.get_ethtool_stats	= igb_get_ethtool_stats,
  	.get_coalesce		= igb_get_coalesce,
  	.set_coalesce		= igb_set_coalesce,
diff --git a/patches/collateral-evolutions/network/0024-led-blink-api/mac80211.patch b/patches/collateral-evolutions/network/0024-led-blink-api/mac80211.patch
index a724ee7..57a717f 100644
--- a/patches/collateral-evolutions/network/0024-led-blink-api/mac80211.patch
+++ b/patches/collateral-evolutions/network/0024-led-blink-api/mac80211.patch
@@ -1,6 +1,6 @@
 --- a/net/mac80211/ieee80211_i.h
 +++ b/net/mac80211/ieee80211_i.h
-@@ -1171,6 +1171,9 @@ struct ieee80211_local {
+@@ -1173,6 +1173,9 @@ struct ieee80211_local {
  	u32 dot11TransmittedFrameCount;
  
  #ifdef CONFIG_MAC80211_LEDS
diff --git a/patches/collateral-evolutions/network/0027-genl-const/ieee802154.patch b/patches/collateral-evolutions/network/0027-genl-const/ieee802154.patch
index 22e45e6..db96738 100644
--- a/patches/collateral-evolutions/network/0027-genl-const/ieee802154.patch
+++ b/patches/collateral-evolutions/network/0027-genl-const/ieee802154.patch
@@ -9,8 +9,8 @@
  	/* see nl-phy.c */
  	IEEE802154_DUMP(IEEE802154_LIST_PHY, ieee802154_list_phy,
  			ieee802154_dump_phy),
-@@ -126,7 +126,7 @@ static const struct genl_ops ieee8021154
- 	IEEE802154_OP(IEEE802154_SET_MACPARAMS, ieee802154_set_macparams),
+@@ -146,7 +146,7 @@ static const struct genl_ops ieee8021154
+ 		      ieee802154_llsec_del_seclevel),
  };
  
 -static const struct genl_multicast_group ieee802154_mcgrps[] = {
diff --git a/patches/collateral-evolutions/network/0027-genl-const/nl80211.patch b/patches/collateral-evolutions/network/0027-genl-const/nl80211.patch
index 0d5b34d..76ee887 100644
--- a/patches/collateral-evolutions/network/0027-genl-const/nl80211.patch
+++ b/patches/collateral-evolutions/network/0027-genl-const/nl80211.patch
@@ -21,7 +21,7 @@
  	[NL80211_MCGRP_CONFIG] = { .name = "config", },
  	[NL80211_MCGRP_SCAN] = { .name = "scan", },
  	[NL80211_MCGRP_REGULATORY] = { .name = "regulatory", },
-@@ -9304,7 +9304,7 @@ static int nl80211_set_qos_map(struct sk
+@@ -9379,7 +9379,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;
-@@ -9373,7 +9373,7 @@ static int nl80211_pre_doit(const struct
+@@ -9448,7 +9448,7 @@ static int nl80211_pre_doit(const struct
  	return 0;
  }
  
@@ -39,7 +39,7 @@
  			      struct genl_info *info)
  {
  	if (info->user_ptr[1]) {
-@@ -9390,7 +9390,7 @@ static void nl80211_post_doit(const stru
+@@ -9465,7 +9465,7 @@ static void nl80211_post_doit(const stru
  		rtnl_unlock();
  }
  
diff --git a/patches/collateral-evolutions/network/0028-select_queue/mac80211.patch b/patches/collateral-evolutions/network/0028-select_queue/mac80211.patch
index 2290203..12eea54 100644
--- a/patches/collateral-evolutions/network/0028-select_queue/mac80211.patch
+++ b/patches/collateral-evolutions/network/0028-select_queue/mac80211.patch
@@ -1,6 +1,6 @@
 --- a/net/mac80211/iface.c
 +++ b/net/mac80211/iface.c
-@@ -1063,10 +1063,19 @@ static void ieee80211_uninit(struct net_
+@@ -1071,10 +1071,19 @@ static void ieee80211_uninit(struct net_
  	ieee80211_teardown_sdata(IEEE80211_DEV_TO_SUB_IF(dev));
  }
  
@@ -20,7 +20,7 @@
  {
  	return ieee80211_select_queue(IEEE80211_DEV_TO_SUB_IF(dev), skb);
  }
-@@ -1082,10 +1091,19 @@ static const struct net_device_ops ieee8
+@@ -1090,10 +1099,19 @@ static const struct net_device_ops ieee8
  	.ndo_select_queue	= ieee80211_netdev_select_queue,
  };
  
diff --git a/patches/collateral-evolutions/network/0032-sriov_configure/igb_sriov_configure.patch b/patches/collateral-evolutions/network/0032-sriov_configure/igb_sriov_configure.patch
index 5b81354..8cf5383 100644
--- a/patches/collateral-evolutions/network/0032-sriov_configure/igb_sriov_configure.patch
+++ b/patches/collateral-evolutions/network/0032-sriov_configure/igb_sriov_configure.patch
@@ -20,7 +20,7 @@
  	.err_handler = &igb_err_handler
  };
  
-@@ -7591,6 +7595,7 @@ static int igb_sriov_reinit(struct pci_d
+@@ -7596,6 +7600,7 @@ static int igb_sriov_reinit(struct pci_d
  	return 0;
  }
  
@@ -28,7 +28,7 @@
  static int igb_pci_disable_sriov(struct pci_dev *dev)
  {
  	int err = igb_disable_sriov(dev);
-@@ -7600,6 +7605,7 @@ static int igb_pci_disable_sriov(struct
+@@ -7605,6 +7610,7 @@ static int igb_pci_disable_sriov(struct
  
  	return err;
  }
@@ -36,7 +36,7 @@
  
  static int igb_pci_enable_sriov(struct pci_dev *dev, int num_vfs)
  {
-@@ -7617,6 +7623,7 @@ out:
+@@ -7622,6 +7628,7 @@ out:
  }
  
  #endif
@@ -44,7 +44,7 @@
  static int igb_pci_sriov_configure(struct pci_dev *dev, int num_vfs)
  {
  #ifdef CONFIG_PCI_IOV
-@@ -7627,6 +7634,7 @@ static int igb_pci_sriov_configure(struc
+@@ -7632,6 +7639,7 @@ static int igb_pci_sriov_configure(struc
  #endif
  	return 0;
  }
diff --git a/patches/collateral-evolutions/network/0033-ndo_vlan_rx_vid/igb_ndo_vlan_rx_vid.patch b/patches/collateral-evolutions/network/0033-ndo_vlan_rx_vid/igb_ndo_vlan_rx_vid.patch
index fe31809..0cb392d 100644
--- a/patches/collateral-evolutions/network/0033-ndo_vlan_rx_vid/igb_ndo_vlan_rx_vid.patch
+++ b/patches/collateral-evolutions/network/0033-ndo_vlan_rx_vid/igb_ndo_vlan_rx_vid.patch
@@ -17,7 +17,7 @@
  static void igb_restore_vlan(struct igb_adapter *);
  static void igb_rar_set_qsel(struct igb_adapter *, u8 *, u32 , u8);
  static void igb_ping_all_vfs(struct igb_adapter *);
-@@ -7261,8 +7269,14 @@ static void igb_vlan_mode(struct net_dev
+@@ -7266,8 +7274,14 @@ static void igb_vlan_mode(struct net_dev
  	igb_rlpml_set(adapter);
  }
  
@@ -32,7 +32,7 @@
  {
  	struct igb_adapter *adapter = netdev_priv(netdev);
  	struct e1000_hw *hw = &adapter->hw;
-@@ -7276,11 +7290,19 @@ static int igb_vlan_rx_add_vid(struct ne
+@@ -7281,11 +7295,19 @@ static int igb_vlan_rx_add_vid(struct ne
  
  	set_bit(vid, adapter->active_vlans);
  
@@ -52,7 +52,7 @@
  {
  	struct igb_adapter *adapter = netdev_priv(netdev);
  	struct e1000_hw *hw = &adapter->hw;
-@@ -7296,7 +7318,9 @@ static int igb_vlan_rx_kill_vid(struct n
+@@ -7301,7 +7323,9 @@ static int igb_vlan_rx_kill_vid(struct n
  
  	clear_bit(vid, adapter->active_vlans);
  
@@ -62,7 +62,7 @@
  }
  
  static void igb_restore_vlan(struct igb_adapter *adapter)
-@@ -7306,7 +7330,11 @@ static void igb_restore_vlan(struct igb_
+@@ -7311,7 +7335,11 @@ static void igb_restore_vlan(struct igb_
  	igb_vlan_mode(adapter->netdev, adapter->netdev->features);
  
  	for_each_set_bit(vid, adapter->active_vlans, VLAN_N_VID)
diff --git a/patches/collateral-evolutions/network/0034-ndo_set_vf_spoofchk/igb_ndo_set_vf_spoofchk.patch b/patches/collateral-evolutions/network/0034-ndo_set_vf_spoofchk/igb_ndo_set_vf_spoofchk.patch
index 9b83f5f..50cbc02 100644
--- a/patches/collateral-evolutions/network/0034-ndo_set_vf_spoofchk/igb_ndo_set_vf_spoofchk.patch
+++ b/patches/collateral-evolutions/network/0034-ndo_set_vf_spoofchk/igb_ndo_set_vf_spoofchk.patch
@@ -3,7 +3,7 @@
 @@ -178,8 +178,10 @@ static int igb_ndo_set_vf_mac(struct net
  static int igb_ndo_set_vf_vlan(struct net_device *netdev,
  			       int vf, u16 vlan, u8 qos);
- static int igb_ndo_set_vf_bw(struct net_device *netdev, int vf, int tx_rate);
+ static int igb_ndo_set_vf_bw(struct net_device *, int, int, int);
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0)
  static int igb_ndo_set_vf_spoofchk(struct net_device *netdev, int vf,
  				   bool setting);
@@ -14,14 +14,14 @@
 @@ -2097,7 +2099,9 @@ static const struct net_device_ops igb_n
  	.ndo_set_vf_mac		= igb_ndo_set_vf_mac,
  	.ndo_set_vf_vlan	= igb_ndo_set_vf_vlan,
- 	.ndo_set_vf_tx_rate	= igb_ndo_set_vf_bw,
+ 	.ndo_set_vf_rate	= igb_ndo_set_vf_bw,
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0)
  	.ndo_set_vf_spoofchk	= igb_ndo_set_vf_spoofchk,
 +#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0) */
  	.ndo_get_vf_config	= igb_ndo_get_vf_config,
  #ifdef CONFIG_NET_POLL_CONTROLLER
  	.ndo_poll_controller	= igb_netpoll,
-@@ -7937,6 +7941,7 @@ static int igb_ndo_set_vf_bw(struct net_
+@@ -7947,6 +7951,7 @@ static int igb_ndo_set_vf_bw(struct net_
  	return 0;
  }
  
@@ -29,7 +29,7 @@
  static int igb_ndo_set_vf_spoofchk(struct net_device *netdev, int vf,
  				   bool setting)
  {
-@@ -7963,6 +7968,7 @@ static int igb_ndo_set_vf_spoofchk(struc
+@@ -7973,6 +7978,7 @@ static int igb_ndo_set_vf_spoofchk(struc
  	adapter->vf_data[vf].spoofchk_enabled = setting;
  	return E1000_SUCCESS;
  }
@@ -37,8 +37,8 @@
  
  static int igb_ndo_get_vf_config(struct net_device *netdev,
  				 int vf, struct ifla_vf_info *ivi)
-@@ -7975,7 +7981,9 @@ static int igb_ndo_get_vf_config(struct
- 	ivi->tx_rate = adapter->vf_data[vf].tx_rate;
+@@ -7986,7 +7992,9 @@ static int igb_ndo_get_vf_config(struct
+ 	ivi->min_tx_rate = 0;
  	ivi->vlan = adapter->vf_data[vf].pf_vlan;
  	ivi->qos = adapter->vf_data[vf].pf_qos;
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0)
diff --git a/patches/collateral-evolutions/network/0035-skb_no_fcs/igb_skb_no_fcs.patch b/patches/collateral-evolutions/network/0035-skb_no_fcs/igb_skb_no_fcs.patch
index 691c1bc..caef10f 100644
--- a/patches/collateral-evolutions/network/0035-skb_no_fcs/igb_skb_no_fcs.patch
+++ b/patches/collateral-evolutions/network/0035-skb_no_fcs/igb_skb_no_fcs.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/ethernet/intel/igb/igb_main.c
 +++ b/drivers/net/ethernet/intel/igb/igb_main.c
-@@ -4768,9 +4768,10 @@ static u32 igb_tx_cmd_type(struct sk_buf
+@@ -4773,9 +4773,10 @@ static u32 igb_tx_cmd_type(struct sk_buf
  	cmd_type |= IGB_SET_FLAG(tx_flags, IGB_TX_FLAGS_TSTAMP,
  				 (E1000_ADVTXD_MAC_TSTAMP));
  
diff --git a/patches/collateral-evolutions/network/0036-ethtool_eee/igb_ethtool_eee.patch b/patches/collateral-evolutions/network/0036-ethtool_eee/igb_ethtool_eee.patch
index c737c98..bf92176 100644
--- a/patches/collateral-evolutions/network/0036-ethtool_eee/igb_ethtool_eee.patch
+++ b/patches/collateral-evolutions/network/0036-ethtool_eee/igb_ethtool_eee.patch
@@ -16,7 +16,7 @@
  
  static int igb_get_module_info(struct net_device *netdev,
  			       struct ethtool_modinfo *modinfo)
-@@ -3024,8 +3026,10 @@ static const struct ethtool_ops igb_etht
+@@ -3025,8 +3027,10 @@ static const struct ethtool_ops igb_etht
  #endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0) */
  	.get_rxnfc		= igb_get_rxnfc,
  	.set_rxnfc		= igb_set_rxnfc,
diff --git a/patches/collateral-evolutions/network/0037-ethtool_get_module/igb_get_module.patch b/patches/collateral-evolutions/network/0037-ethtool_get_module/igb_get_module.patch
index a703f62..147fe8e 100644
--- a/patches/collateral-evolutions/network/0037-ethtool_get_module/igb_get_module.patch
+++ b/patches/collateral-evolutions/network/0037-ethtool_get_module/igb_get_module.patch
@@ -16,7 +16,7 @@
  
  static int igb_ethtool_begin(struct net_device *netdev)
  {
-@@ -3030,8 +3032,10 @@ static const struct ethtool_ops igb_etht
+@@ -3031,8 +3033,10 @@ static const struct ethtool_ops igb_etht
  	.get_eee		= igb_get_eee,
  	.set_eee		= igb_set_eee,
  #endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0) */
@@ -25,5 +25,5 @@
  	.get_module_eeprom	= igb_get_module_eeprom,
 +#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0) */
  	.get_rxfh_indir_size	= igb_get_rxfh_indir_size,
- 	.get_rxfh_indir		= igb_get_rxfh_indir,
- 	.set_rxfh_indir		= igb_set_rxfh_indir,
+ 	.get_rxfh		= igb_get_rxfh,
+ 	.set_rxfh		= igb_set_rxfh,
diff --git a/patches/collateral-evolutions/network/0038-ethtool_rxfh_indir/igb_rxfh_indir.patch b/patches/collateral-evolutions/network/0038-ethtool_rxfh_indir/igb_rxfh_indir.patch
index 75b9e61..870f793 100644
--- a/patches/collateral-evolutions/network/0038-ethtool_rxfh_indir/igb_rxfh_indir.patch
+++ b/patches/collateral-evolutions/network/0038-ethtool_rxfh_indir/igb_rxfh_indir.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/ethernet/intel/igb/igb_ethtool.c
 +++ b/drivers/net/ethernet/intel/igb/igb_ethtool.c
-@@ -2831,6 +2831,7 @@ static void igb_ethtool_complete(struct
+@@ -2831,12 +2831,17 @@ static void igb_ethtool_complete(struct
  	pm_runtime_put(&adapter->pdev->dev);
  }
  
@@ -8,7 +8,17 @@
  static u32 igb_get_rxfh_indir_size(struct net_device *netdev)
  {
  	return IGB_RETA_SIZE;
-@@ -2846,6 +2847,7 @@ static int igb_get_rxfh_indir(struct net
+ }
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0)
+ static int igb_get_rxfh(struct net_device *netdev, u32 *indir, u8 *key)
++#else
++static int igb_get_rxfh(struct net_device *netdev, u32 *indir)
++#endif
+ {
+ 	struct igb_adapter *adapter = netdev_priv(netdev);
+ 	int i;
+@@ -2846,6 +2851,7 @@ static int igb_get_rxfh(struct net_devic
  
  	return 0;
  }
@@ -16,15 +26,21 @@
  
  void igb_write_rss_indir_tbl(struct igb_adapter *adapter)
  {
-@@ -2882,6 +2884,7 @@ void igb_write_rss_indir_tbl(struct igb_
+@@ -2882,8 +2888,13 @@ void igb_write_rss_indir_tbl(struct igb_
  	}
  }
  
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0)
- static int igb_set_rxfh_indir(struct net_device *netdev, const u32 *indir)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0)
+ static int igb_set_rxfh(struct net_device *netdev, const u32 *indir,
+ 			const u8 *key)
++#else
++static int igb_set_rxfh(struct net_device *netdev, const u32 *indir)
++#endif
  {
  	struct igb_adapter *adapter = netdev_priv(netdev);
-@@ -2914,6 +2917,7 @@ static int igb_set_rxfh_indir(struct net
+ 	struct e1000_hw *hw = &adapter->hw;
+@@ -2915,6 +2926,7 @@ static int igb_set_rxfh(struct net_devic
  
  	return 0;
  }
@@ -32,14 +48,18 @@
  
  static unsigned int igb_max_channels(struct igb_adapter *adapter)
  {
-@@ -3036,9 +3040,11 @@ static const struct ethtool_ops igb_etht
+@@ -3037,9 +3049,15 @@ static const struct ethtool_ops igb_etht
  	.get_module_info	= igb_get_module_info,
  	.get_module_eeprom	= igb_get_module_eeprom,
  #endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0) */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0)
  	.get_rxfh_indir_size	= igb_get_rxfh_indir_size,
- 	.get_rxfh_indir		= igb_get_rxfh_indir,
- 	.set_rxfh_indir		= igb_set_rxfh_indir,
+ 	.get_rxfh		= igb_get_rxfh,
+ 	.set_rxfh		= igb_set_rxfh,
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0)
++	.get_rxfh_indir_size	= igb_get_rxfh_indir_size,
++	.get_rxfh_indir		= igb_get_rxfh,
++	.set_rxfh_indir		= igb_set_rxfh,
 +#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0) */
  	.get_channels		= igb_get_channels,
  	.set_channels		= igb_set_channels,
-- 
1.9.1