Skip to contentSkip to conversation

backports: move us up to next-20130423

PATCH In review Luis R. Rodriguez 2 participants 9 messages May 11, 2013 – May 15, 2013 Arm/actions semi architecture

lore
Share & tools
lore
#0 lore raw

v2 cover backports: move us up to next-20130423

From: "Luis R. Rodriguez" <[email protected]>

I've addressed backporting rfkill here in a way that I think is more suitable. Let me know what you think.

Johannes Berg (1):
backports: adjust snd_portid patch for nl80211 update

Luis R. Rodriguez (4):
backports: backport rfkill properly
backports: backport vlan ethernet changes
backports: address vlan ethernet driver changes
backports: refresh patches for next-20130423

 backport/backport-include/linux/if_vlan.h          |   18 +++++
 backport/backport-include/linux/netdev_features.h  |   23 +++++++
 backport/backport-include/linux/rfkill.h           |   13 ++--
 copy-list                                          |    4 +-
 .../network/0001-netdev_ops/mac80211.patch         |    6 +-
 .../network/0001-netdev_ops/mac80211_hwsim.patch   |    2 +-
 .../mac80211.patch                                 |    4 +-
 .../0005-netlink-portid/mac80211_hwsim.patch       |    4 +-
 .../network/0005-netlink-portid/nl80211.patch      |   69 +++++++++++---------
 .../0006-disable-dump-adjust-on-old-kernels.patch  |    4 +-
 .../network/0007-ksize-orinoco.patch               |    1 +
 .../network/0008-rfkill.patch                      |   34 ++++++----
 .../include_net_cfg80211.patch                     |    2 +-
 .../drivers_net_wireless_iwlegacy_4965-mac.patch   |    2 +-
 .../net_mac80211_tx.patch                          |    4 +-
 .../17-netdev-queue/net_mac80211_iface.patch       |    4 +-
 .../network/22-multiqueue/net_mac80211_tx.patch    |    2 +-
 .../drivers_net_wireless_mwl8k.patch               |   10 +--
 .../include_net_mac80211.patch                     |    2 +-
 .../net_mac80211_ieee80211_i.patch                 |    2 +-
 .../net_mac80211_iface.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 |   14 ++--
 ...ers_net_ethernet_atheros_atl1e_atl1e_main.patch |    6 +-
 .../drivers_net_ethernet_atheros_atlx_atl1.patch   |    4 +-
 .../drivers_net_ethernet_atheros_atlx_atl2.patch   |   49 ++++++++++----
 .../42-netlink_seq/net_wireless_nl80211.patch      |    2 +-
 .../drivers_net_wireless_rt2x00_rt2500usb.patch    |    2 +-
 .../network/66-uapi-changes/INFO                   |   18 -----
 .../include_linux_rfkill_backport.patch            |   11 ----
 .../69-wowlan-no-socket/net_wireless_nl80211.patch |    2 +-
 32 files changed, 190 insertions(+), 134 deletions(-)
 create mode 100644 backport/backport-include/linux/if_vlan.h
 delete mode 100644 patches/collateral-evolutions/network/66-uapi-changes/INFO
 delete mode 100644 patches/collateral-evolutions/network/66-uapi-changes/include_linux_rfkill_backport.patch
Signature · 1 line
1.7.10.4
#1 lore raw

PATCH v2 1/5 backports: backport rfkill properly

From: "Luis R. Rodriguez" <[email protected]>

rfkill was being backported using a strategy similar to the way backports was changed recently with the only difference that rfkill_backport.h was being used. Adjust this to enable backporting rfkill as we do with other modules.

In summary of how we backport rfkill now:

rfkill was re-implemented completely on 2.6.31. As we move on with new kernels they'll get support for new rfkill types. We port rfkill to older kernels with this strategy then:

* For kernels < 2.6.31:
o use backport_ prefix for exported symbols
o use:
/dev/rfkill_backport /sys/class/rfkill_backport
* For kernels >= 2.6.31:
o use the standard
/dev/rfkill /sys/class/rfkill

Worth mentioning NFC rfkill support was added on next-20130423.

commit 44b3decb414919760c7327df05e63372c1bf5d9a

Author: Samuel Ortiz <[email protected]>
Date:   Thu Apr 11 11:51:36 2013 +0200

rfkill: Add NFC to the list of supported radios

And return the proper string for it.

---
 backport/backport-include/linux/rfkill.h           |   13 +++-----
 copy-list                                          |    4 +--
 .../network/0007-ksize-orinoco.patch               |    1 +
 .../network/0008-rfkill.patch                      |   34 +++++++++++++-------
 .../network/66-uapi-changes/INFO                   |   18 -----------
 .../include_linux_rfkill_backport.patch            |   11 -------
 6 files changed, 30 insertions(+), 51 deletions(-)
 delete mode 100644 patches/collateral-evolutions/network/66-uapi-changes/INFO
 delete mode 100644 patches/collateral-evolutions/network/66-uapi-changes/include_linux_rfkill_backport.patch
backport/backport-include/linux/rfkill.h +5 -8
index 01d18f1..09f8aae 100644
@@ -1,10 +1,7 @@
-#ifndef __COMPAT_RFKILL_H
-#define __COMPAT_RFKILL_H
+#ifndef __BACKPORT_RFKILL_H
+#define __BACKPORT_RFKILL_H
 #include <linux/version.h>
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
-#include_next <linux/rfkill.h>
-#else
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31)
 #define rfkill_get_led_trigger_name LINUX_BACKPORT(rfkill_get_led_trigger_name)
 #define rfkill_set_led_trigger_name LINUX_BACKPORT(rfkill_set_led_trigger_name)
@@ -20,7 +17,7 @@
 #define rfkill_unregister LINUX_BACKPORT(rfkill_unregister)
 #define rfkill_destroy LINUX_BACKPORT(rfkill_destroy)
 #endif
-#include <linux/rfkill_backport.h>
-#endif
 
-#endif
+#include_next <linux/rfkill.h>
+
+#endif /* __BACKPORT_RFKILL_H */
copy-list +2 -2
index 8b3de0c..a7c48ca 100644
@@ -30,8 +30,8 @@ include/linux/spi/libertas_spi.h
 include/linux/platform_data/brcmfmac-sdio.h
 
 include/uapi/linux/nl80211.h
-include/linux/rfkill.h -> include/linux/rfkill_backport.h
-include/uapi/linux/rfkill.h -> include/uapi/linux/rfkill_backport.h
+include/linux/rfkill.h
+include/uapi/linux/rfkill.h
 
 include/net/cfg80211.h
 include/net/cfg80211-wext.h
patches/collateral-evolutions/network/0007-ksize-orinoco.patch +1 -0
index 934e2fa..8d5bb7f 100644
@@ -1,3 +1,4 @@
+
 ksize() was added as of 2.6.29, it gives you the actual
 size of the allocated data. Since we have no support for
 this we simply do not optimize for it and deal with
patches/collateral-evolutions/network/0008-rfkill.patch +22 -12
index 7e494a1..6d4da4c 100644
@@ -1,12 +1,16 @@
-rfkill was re-implemented on 2.6.31. We port it to
-older kernels with a simple hack, just rename the
-module as a new one rfkill_backport, and every
-exported symbol gets redefined with a _backport
-postfix through compat-2.6.31.h. The changes below
-are the ones we could not do through compat-2.6.31.h
+rfkill was re-implemented completely on 2.6.31. As we move on
+with new kernels they'll get support for new rfkill types.
+We port rfkill to older kernels with this strategy then:
 
-Do older kernels have /dev/rfkill ? I not then we can
-just keep /dev/rfkill and not /dev/rfkill_backport.
+  * For kernels < 2.6.31:
+	o use backport_ prefix for exported symbols
+	o use:
+		/dev/rfkill_backport
+		/sys/class/rfkill_backport
+  * For kernels >= 2.6.31:
+	o use the standard
+		/dev/rfkill
+		/sys/class/rfkill
 
 Note that 2.6.31 added netdevice notifier upon interface
 dev_open() which on cfg80211 will check if checks to see
@@ -30,23 +34,29 @@ This would do the policing from within mac80211.
 
 --- a/net/rfkill/core.c
 +++ b/net/rfkill/core.c
-@@ -826,7 +826,7 @@ static int rfkill_resume(struct device *
+@@ -828,7 +828,11 @@ static int rfkill_resume(struct device *
  }
  
  static struct class rfkill_class = {
--	.name		= "rfkill",
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31))
 +	.name		= "rfkill_backport",
++#else
+ 	.name		= "rfkill",
++#endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31)) */
  	.dev_release	= rfkill_release,
  	.dev_attrs	= rfkill_dev_attrs,
  	.dev_uevent	= rfkill_dev_uevent,
 --- a/net/rfkill/input.c
 +++ b/net/rfkill/input.c
-@@ -230,7 +230,7 @@ static int rfkill_connect(struct input_h
+@@ -230,7 +230,11 @@ static int rfkill_connect(struct input_h
  
  	handle->dev = dev;
  	handle->handler = handler;
--	handle->name = "rfkill";
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31))
 +	handle->name = "rfkill_backport";
++#else
+ 	handle->name = "rfkill";
++#endif
  
  	/* causes rfkill_start() to be called */
  	error = input_register_handle(handle);
patches/collateral-evolutions/network/66-uapi-changes/INFO deleted +0 -18
deleted file mode 100644
index aac0225..0000000
@@ -1,18 +0,0 @@
-The UAPI changes split up the kernel and userspace API
-headers into separate directories. We provide backport
-support for the new rfkill module to kernels older than
-2.6.31. To allow us to dynamically provide only backport
-support for those kernels we have a trick within compat
-to provide its own include/linux/rfkill.h header which
-then will include either your own kernel's rkfill.h or
-include the one we are taking from linux-next. The one
-we take from linux-next is renamed to rfkill_backport.h.
-In order to allow the call to include your own kernel's
-rfkill.h the compat rfkill.h uses include_next. The UAPI
-changes would mean though that instead of getting your
-own kernel's rfkill.h you'd end up getting the UAPI
-header file. Fix this by ensuring that for new kernels
-we linux_next into the user's kernels rfkill.h and if
-the kernel is old we still to the rfkill_backport.h
-naming scheme.
-
patches/collateral-evolutions/network/66-uapi-changes/include_linux_rfkill_backport.patch deleted +0 -11
deleted file mode 100644
index f5d69d4..0000000
@@ -1,11 +0,0 @@
---- a/include/linux/rfkill_backport.h
-+++ b/include/linux/rfkill_backport.h
-@@ -18,7 +18,7 @@
- #ifndef __RFKILL_H
- #define __RFKILL_H
- 
--#include <uapi/linux/rfkill.h>
-+#include <uapi/linux/rfkill_backport.h>
- 
- /* don't allow anyone to use these in the kernel */
- enum rfkill_user_states {
Signature · 1 line
1.7.10.4
#2 lore raw

Re: [PATCH v2 1/5] backports: backport rfkill properly

Quoted 4 lines · Luis R. Rodriguez

* For kernels >= 2.6.31:
o use the standard
/dev/rfkill
/sys/class/rfkill

I think this is wrong. It means that if you build rfkill (e.g. for 3.2) then it would conflict with the kernel's rfkill.

The thing is that *usually*, for >=2.6.31, you just want to use the kernel's rfkill. So for that usage, we should backport the rfkill API, like we usually backport things.

However, NFC probably requires a backported rfkill, not just backporting around rfkill. For this we do need it named rfkill_backport though, I think.

Maybe we can backport the NFC support in some other way?

johannes

#3 lore raw

Re: [PATCH v2 1/5] backports: backport rfkill properly

Quoted 8 lines · Johannes Berg
Quoted 4 lines · Luis R. Rodriguez

* For kernels >= 2.6.31:
o use the standard
/dev/rfkill
/sys/class/rfkill

I think this is wrong. It means that if you build rfkill (e.g. for 3.2) then it would conflict with the kernel's rfkill.

It would replace it unless you built it obj-y. What issues are there with replacing in your example 3.2's rfkill?

Quoted 3 lines

The thing is that *usually*, for >=2.6.31, you just want to use the kernel's rfkill. So for that usage, we should backport the rfkill API, like we usually backport things.

On second thought I can see this being true given that we don't backport WiMax, UWB, GPS (although I think this is serial and FM (not used in the kernel) but the API has remained consistent too so don't see this breaking those drivers ?

Quoted 2 lines

However, NFC probably requires a backported rfkill, not just backporting around rfkill.

Indeed.

Quoted 2 lines

For this we do need it named rfkill_backport though, I think.

Using a separate namespace is fine too but that would then require also changing the module name which I just saw now were only doing before it seems on compat-drivers, this change got lost on backports somehow.

Quoted 1 line

Maybe we can backport the NFC support in some other way?

Using a different module and namespace is possible, we however lost the Makefile changes even for older kernels.

Luis

#4 lore raw

PATCH v2 2/5 backports: adjust snd_portid patch for nl80211 update

In reply to Luis R. Rodriguez

From: Johannes Berg <[email protected]>

The new code for the "critical protocol indication" uses snd_portid and must be adjusted in the backport patches. This is required as of next-20130423.

commit 5de17984898c5758fc6ebe08eccea9f4b6548914

Author: Arend van Spriel <[email protected]>
Date:   Thu Apr 18 15:49:00 2013 +0200

cfg80211: introduce critical protocol indication from user-space

Some protocols need a more reliable connection to complete successful in reasonable time. This patch adds a user-space API to indicate the wireless driver that a critical protocol is about to commence and when it is done, using nl80211 primitives NL80211_CMD_CRIT_PROTOCOL_START and NL80211_CRIT_PROTOCOL_STOP.

There can be only on critical protocol session started per registered cfg80211 device.

The driver can support this by implementing the cfg80211 callbacks .crit_proto_start() and .crit_proto_stop(). Examples of protocols that can benefit from this are DHCP, EAPOL, APIPA. Exactly how the link can/should be made more reliable is up to the driver. Things to consider are avoid scanning, no multi-channel operations, and alter coexistence schemes.

[[email protected]]: Required as of next-20130423
and provided commit log message that introduced this change.

---
 .../network/0005-netlink-portid/nl80211.patch                 |    9 +++++++++
 1 file changed, 9 insertions(+)
patches/collateral-evolutions/network/0005-netlink-portid/nl80211.patch +9 -0
index 0e2b981..bde418d 100644
@@ -232,6 +232,15 @@
  			     NL80211_CMD_GET_PROTOCOL_FEATURES);
  	if (!hdr)
  		goto nla_put_failure;
+@@ -8261,7 +8261,7 @@ static int nl80211_crit_protocol_start(struct sk_buff *skb,
+ 
+ 	ret = rdev_crit_proto_start(rdev, wdev, proto, duration);
+ 	if (!ret)
+-		rdev->crit_proto_nlportid = info->snd_portid;
++		rdev->crit_proto_nlportid = genl_info_snd_portid(info);
+ 
+ 	return ret;
+ }
 @@ -10565,12 +10565,12 @@ static int nl80211_netlink_notify(struct
  
  	list_for_each_entry_rcu(rdev, &cfg80211_rdev_list, list) {
Signature · 1 line
1.7.10.4
#5 lore raw

PATCH v2 3/5 backports: backport vlan ethernet changes

In reply to Luis R. Rodriguez

From: "Luis R. Rodriguez" <[email protected]>

This backports 9356b8fc d314774c and f646968f8f all added in next-20130423. Soome driver changes are still required and will be addressed separately.

commit 9356b8fc07dc126cd91d2b12f314d760ab48996e

Author: Eric Dumazet <[email protected]>
Date:   Tue Sep 27 15:23:16 2005 -0700

[NET]: Reorder some hot fields of struct net_device

Place them on separate cache lines in SMP to lower memory bouncing between multiple CPU accessing the device.

- One part is mostly used on receive path (including eth_type_trans()) (poll_list, poll, quota, weight, last_rx, dev_addr, broadcast)

- One part is mostly used on queue transmit path (qdisc) (queue_lock, qdisc, qdisc_sleeping, qdisc_list, tx_queue_len)

- One part is mostly used on xmit path (device) (xmit_lock, xmit_lock_owner, priv, hard_start_xmit, trans_start)

'features' is placed outside of these hot points, in a location that may be shared by all cpus (because mostly read)

name_hlist is moved close to name[IFNAMSIZ] to speedup __dev_get_by_name()

commit d314774cf2cd5dfeb39a00d37deee65d4c627927

Author: Stephen Hemminger <[email protected]>
Date:   Wed Nov 19 21:32:24 2008 -0800

netdev: network device operations infrastructure

This patch changes the network device internal API to move adminstrative operations out of the network device structure and into a separate structure.

This patch involves some hackery to maintain compatablity between the new and old model, so all 300+ drivers don't have to be changed at once. For drivers that aren't converted yet, the netdevice_ops virt function list still resides in the net_device structure. For old protocols, the new net_device_ops are copied out to the old net_device pointers.

After the transistion is completed the nag message can be changed to an WARN_ON, and the compatiablity code can be made configurable.

Some function pointers aren't moved:
* destructor can't be in net_device_ops because
it may need to be referenced after the module is unloaded.
* neighbor setup is manipulated in a couple of places that need special consideration
* hard_start_xmit is in the fast path for transmit.

commit f646968f8f7c624587de729115d802372b9063dd

Author: Patrick McHardy <[email protected]>
Date:   Fri Apr 19 02:04:27 2013 +0000

net: vlan: rename NETIF_F_HW_VLAN_* feature flags to NETIF_F_HW_VLAN_CTAG_*

Rename the hardware VLAN acceleration features to include "CTAG" to indicate that they only support CTAGs. Follow up patches will introduce 802.1ad server provider tagging (STAGs) and require the distinction for hardware not supporting acclerating both.

---
 backport/backport-include/linux/if_vlan.h         |   18 ++++++++++++++++
 backport/backport-include/linux/netdev_features.h |   23 +++++++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 backport/backport-include/linux/if_vlan.h
backport/backport-include/linux/if_vlan.h new file +18 -0
new file mode 100644
index 0000000..a5839e8
@@ -0,0 +1,18 @@
+#ifndef __BACKPORT_LINUX_IF_VLAN_H_
+#define __BACKPORT_LINUX_IF_VLAN_H_
+#include_next <linux/if_vlan.h>
+
+#define vlan_insert_tag(__skb, __vlan_proto, __vlan_tci)	vlan_insert_tag(__skb, __vlan_tci)
+#define __vlan_put_tag(__skb, __vlan_proto, __vlan_tci)		__vlan_put_tag(__skb, __vlan_tci)
+#define vlan_put_tag(__skb, __vlan_proto, __vlan_tci)		vlan_put_tag(__skb, __vlan_tci)
+#define __vlan_hwaccel_put_tag(__skb, __vlan_proto, __vlan_tag)	__vlan_hwaccel_put_tag(__skb, __vlan_tag)
+
+static inline bool vlan_hw_offload_capable(netdev_features_t features,
+					   __be16 proto)
+{
+	if (proto == htons(ETH_P_8021Q) && features & NETIF_F_HW_VLAN_CTAG_TX)
+		return true;
+	return false;
+}
+
+#endif /* __BACKPORT_LINUX_IF_VLAN_H_ */
backport/backport-include/linux/netdev_features.h +23 -0
index bac3a3e..3826e55 100644
@@ -7,9 +7,32 @@
 #include <linux/netdevice.h>
 #include <linux/types.h>
 
+/* added via 9356b8fc */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,14)
+#define NETIF_F_HW_VLAN_CTAG_RX			NETIF_F_HW_VLAN_RX
+#define NETIF_F_HW_VLAN_CTAG_TX			NETIF_F_HW_VLAN_TX
+#endif
+
+/* added via d314774c */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
+#define NETIF_F_HW_VLAN_CTAG_FILTER		NETIF_F_HW_VLAN_FILTER
+#endif
+
 typedef u32 netdev_features_t;
 #else
 #include_next <linux/netdev_features.h>
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0)
+/* See commit f646968f8f on next-20130423 */
+#define NETIF_F_HW_VLAN_CTAG_TX_BIT		NETIF_F_HW_VLAN_TX_BIT
+#define NETIF_F_HW_VLAN_CTAG_RX_BIT		NETIF_F_HW_VLAN_RX_BIT
+#define NETIF_F_HW_VLAN_CTAG_FILTER_BIT		NETIF_F_HW_VLAN_FILTER_BIT
+
+#define NETIF_F_HW_VLAN_CTAG_FILTER		NETIF_F_HW_VLAN_FILTER
+#define NETIF_F_HW_VLAN_CTAG_RX			NETIF_F_HW_VLAN_RX
+#define NETIF_F_HW_VLAN_CTAG_TX			NETIF_F_HW_VLAN_TX
+#endif
+
 #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0) */
 
 #if !defined(NETIF_F_RXCSUM)
Signature · 1 line
1.7.10.4
#6 lore raw

PATCH v2 4/5 backports: address vlan ethernet driver changes

In reply to Luis R. Rodriguez

From: "Luis R. Rodriguez" <[email protected]>

This addresses the last remaining components to backport the ethernet vlan changes introduced by 9356b8fc d314774c and f646968f8f on next-20130423.

---
 ...ers_net_ethernet_atheros_atl1c_atl1c_main.patch |   14 +++---
 ...ers_net_ethernet_atheros_atl1e_atl1e_main.patch |    6 +--
 .../drivers_net_ethernet_atheros_atlx_atl1.patch   |    6 +--
 .../drivers_net_ethernet_atheros_atlx_atl2.patch   |   49 +++++++++++++++-----
 4 files changed, 51 insertions(+), 24 deletions(-)
patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atl1c_atl1c_main.patch +7 -7
index f0e6f90..f673667 100644
@@ -47,18 +47,18 @@
  	.ndo_do_ioctl		= atl1c_ioctl,
  	.ndo_tx_timeout		= atl1c_tx_timeout,
  	.ndo_get_stats		= atl1c_get_stats,
-@@ -2479,6 +2494,7 @@ static int atl1c_init_netdev(struct net_
+@@ -2478,6 +2493,7 @@ static int atl1c_init_netdev(struct net_
+ 	netdev->watchdog_timeo = AT_TX_WATCHDOG;
  	atl1c_set_ethtool_ops(netdev);
  
- 	/* TODO: add when ready */
 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39))
- 	netdev->hw_features =	NETIF_F_SG	   |
- 				NETIF_F_HW_CSUM	   |
- 				NETIF_F_HW_VLAN_RX |
+ 	/* TODO: add when ready */
+ 	netdev->hw_features =	NETIF_F_SG		|
+ 				NETIF_F_HW_CSUM		|
 @@ -2486,6 +2502,14 @@ static int atl1c_init_netdev(struct net_
  				NETIF_F_TSO6;
- 	netdev->features =	netdev->hw_features |
- 				NETIF_F_HW_VLAN_TX;
+ 	netdev->features =	netdev->hw_features	|
+ 				NETIF_F_HW_VLAN_CTAG_TX;
 +#else
 +	netdev->features =	NETIF_F_SG	   |
 +				NETIF_F_HW_CSUM	   |
patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atl1e_atl1e_main.patch +3 -3
index 04eeb51..5a84c32 100644
@@ -45,13 +45,13 @@
  
 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39))
  	netdev->hw_features = NETIF_F_SG | NETIF_F_HW_CSUM | NETIF_F_TSO |
- 			      NETIF_F_HW_VLAN_RX;
+ 			      NETIF_F_HW_VLAN_CTAG_RX;
  	netdev->features = netdev->hw_features | NETIF_F_LLTX |
- 			   NETIF_F_HW_VLAN_TX;
+ 			   NETIF_F_HW_VLAN_CTAG_TX;
 +#else
 +	netdev->features = NETIF_F_SG | NETIF_F_HW_CSUM | NETIF_F_TSO |
 +			   NETIF_F_HW_VLAN_RX | NETIF_F_LLTX | NETIF_F_HW_VLAN_TX;
-+#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)) */
++#endif
  
  	return 0;
  }
patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atlx_atl1.patch +3 -3
index 2d36137..47dc6ae 100644
@@ -11,13 +11,13 @@
  	.ndo_do_ioctl		= atlx_ioctl,
  	.ndo_tx_timeout		= atlx_tx_timeout,
  #ifdef CONFIG_NET_POLL_CONTROLLER
-@@ -3023,11 +3025,13 @@ static int atl1_probe(struct pci_dev *pd
+@@ -3020,11 +3025,13 @@ static int atl1_probe(struct pci_dev *pd
  	netdev->features |= NETIF_F_SG;
- 	netdev->features |= (NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX);
+ 	netdev->features |= (NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX);
  
 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39))
  	netdev->hw_features = NETIF_F_HW_CSUM | NETIF_F_SG | NETIF_F_TSO |
- 			      NETIF_F_HW_VLAN_RX;
+ 			      NETIF_F_HW_VLAN_CTAG_RX;
  
  	/* is this valid? see atl1_setup_mac_ctrl() */
  	netdev->features |= NETIF_F_RXCSUM;
patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atlx_atl2.patch +38 -11

89 lines not on this page · raw message

Signature · 1 line
1.7.10.4
#7 lore raw

PATCH v2 5/5 backports: refresh patches for next-20130423

In reply to Luis R. Rodriguez

From: "Luis R. Rodriguez" <[email protected]>

== ckmake-report.log ==

1   2.6.24              [  OK  ]
2   2.6.25              [  OK  ]
3   2.6.26              [  OK  ]
4   2.6.27              [  OK  ]
5   2.6.28              [  OK  ]
6   2.6.29              [  OK  ]
7   2.6.30              [  OK  ]
8   2.6.31              [  OK  ]
9   2.6.32              [  OK  ]
10  2.6.33              [  OK  ]
11  2.6.34              [  OK  ]
12  2.6.35              [  OK  ]
13  2.6.36              [  OK  ]
14  2.6.37              [  OK  ]
15  2.6.38              [  OK  ]
16  2.6.39              [  OK  ]
17  3.0.76              [  OK  ]
18  3.1.10              [  OK  ]
19  3.2.44              [  OK  ]
20  3.3.8               [  OK  ]
21  3.4.43              [  OK  ]
22  3.5.7               [  OK  ]
23  3.6.11              [  OK  ]
24  3.7.10              [  OK  ]
25  3.8.11              [  OK  ]
26  3.9.0               [  OK  ]
real    30m53.044s
user    815m38.362s
sys     127m50.187s
---
 .../network/0001-netdev_ops/mac80211.patch         |    6 +-
 .../network/0001-netdev_ops/mac80211_hwsim.patch   |    2 +-
 .../mac80211.patch                                 |    4 +-
 .../0005-netlink-portid/mac80211_hwsim.patch       |    4 +-
 .../network/0005-netlink-portid/nl80211.patch      |   62 ++++++++++----------
 .../0006-disable-dump-adjust-on-old-kernels.patch  |    4 +-
 .../include_net_cfg80211.patch                     |    2 +-
 .../drivers_net_wireless_iwlegacy_4965-mac.patch   |    2 +-
 .../net_mac80211_tx.patch                          |    4 +-
 .../17-netdev-queue/net_mac80211_iface.patch       |    4 +-
 .../network/22-multiqueue/net_mac80211_tx.patch    |    2 +-
 .../drivers_net_wireless_mwl8k.patch               |   10 ++--
 .../include_net_mac80211.patch                     |    2 +-
 .../net_mac80211_ieee80211_i.patch                 |    2 +-
 .../net_mac80211_iface.patch                       |    2 +-
 .../30-bridge-port/net_wireless_nl80211.patch      |    2 +-
 .../network/36-workqueue/net_mac80211_main.patch   |    2 +-
 .../drivers_net_ethernet_atheros_atlx_atl1.patch   |    2 +-
 .../42-netlink_seq/net_wireless_nl80211.patch      |    2 +-
 .../drivers_net_wireless_rt2x00_rt2500usb.patch    |    2 +-
 .../69-wowlan-no-socket/net_wireless_nl80211.patch |    2 +-
 21 files changed, 62 insertions(+), 62 deletions(-)
patches/collateral-evolutions/network/0001-netdev_ops/mac80211.patch +3 -3
index d8b4169..04c9132 100644
@@ -1,6 +1,6 @@
 --- a/net/mac80211/iface.c
 +++ b/net/mac80211/iface.c
-@@ -1068,7 +1068,7 @@ static void ieee80211_if_setup(struct ne
+@@ -1069,7 +1069,7 @@ static void ieee80211_if_setup(struct ne
  {
  	ether_setup(dev);
  	dev->priv_flags &= ~IFF_TX_SKB_SHARING;
@@ -9,7 +9,7 @@
  	dev->destructor = free_netdev;
  }
  
-@@ -1231,7 +1231,7 @@ static void ieee80211_setup_sdata(struct
+@@ -1232,7 +1232,7 @@ static void ieee80211_setup_sdata(struct
  
  	/* only monitor/p2p-device differ */
  	if (sdata->dev) {
@@ -18,7 +18,7 @@
  		sdata->dev->type = ARPHRD_ETHER;
  	}
  
-@@ -1269,7 +1269,7 @@ static void ieee80211_setup_sdata(struct
+@@ -1270,7 +1270,7 @@ static void ieee80211_setup_sdata(struct
  		break;
  	case NL80211_IFTYPE_MONITOR:
  		sdata->dev->type = ARPHRD_IEEE80211_RADIOTAP;
patches/collateral-evolutions/network/0001-netdev_ops/mac80211_hwsim.patch +1 -1
index f23c3e4..6eb68e7 100644
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/mac80211_hwsim.c
 +++ b/drivers/net/wireless/mac80211_hwsim.c
-@@ -1707,7 +1707,7 @@ static const struct net_device_ops hwsim
+@@ -1739,7 +1739,7 @@ static const struct net_device_ops hwsim
  
  static void hwsim_mon_setup(struct net_device *dev)
  {
patches/collateral-evolutions/network/0003-netdev-needed_headroom_tailroom/mac80211.patch +2 -2
index 0d48e3c..83749a5 100644
@@ -1,6 +1,6 @@
 --- a/net/mac80211/iface.c
 +++ b/net/mac80211/iface.c
-@@ -1564,6 +1564,7 @@ int ieee80211_if_add(struct ieee80211_lo
+@@ -1565,6 +1565,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 */
-@@ -1572,6 +1573,7 @@ int ieee80211_if_add(struct ieee80211_lo
+@@ -1573,6 +1574,7 @@ int ieee80211_if_add(struct ieee80211_lo
  					- ETH_HLEN /* ethernet hard_header_len */
  					+ IEEE80211_ENCRYPT_HEADROOM;
  		ndev->needed_tailroom = IEEE80211_ENCRYPT_TAILROOM;
patches/collateral-evolutions/network/0005-netlink-portid/mac80211_hwsim.patch +2 -2
index 3910fd8..e7b9e16 100644
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/mac80211_hwsim.c
 +++ b/drivers/net/wireless/mac80211_hwsim.c
-@@ -2031,10 +2031,10 @@ static int hwsim_register_received_nl(st
+@@ -2063,10 +2063,10 @@ static int hwsim_register_received_nl(st
  	if (info == NULL)
  		goto out;
  
@@ -13,7 +13,7 @@
  
  	return 0;
  out:
-@@ -2071,7 +2071,7 @@ static int mac80211_hwsim_netlink_notify
+@@ -2103,7 +2103,7 @@ static int mac80211_hwsim_netlink_notify
  	if (state != NETLINK_URELEASE)
  		return NOTIFY_DONE;
  
patches/collateral-evolutions/network/0005-netlink-portid/nl80211.patch +31 -31

225 lines not on this page · raw message

patches/collateral-evolutions/network/0006-disable-dump-adjust-on-old-kernels.patch +2 -2
index ff7abf7..fa73e2a 100644
@@ -28,7 +28,7 @@ Date:   Fri Mar 1 14:03:49 2013 +0100
 
 --- a/net/wireless/nl80211.c
 +++ b/net/wireless/nl80211.c
-@@ -1600,6 +1600,7 @@ static int nl80211_dump_wiphy(struct sk_
+@@ -1611,6 +1611,7 @@ static int nl80211_dump_wiphy(struct sk_
  						 &cb->args[2],
  						 &cb->args[3]);
  			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
-@@ -1620,6 +1621,7 @@ static int nl80211_dump_wiphy(struct sk_
+@@ -1631,6 +1632,7 @@ static int nl80211_dump_wiphy(struct sk_
  					mutex_unlock(&cfg80211_mutex);
  					return 1;
  				}
patches/collateral-evolutions/network/09-cfg80211-wext-padding/include_net_cfg80211.patch +1 -1
index 8ac85f7..9e9a8d0 100644
@@ -1,6 +1,6 @@
 --- a/include/net/cfg80211.h
 +++ b/include/net/cfg80211.h
-@@ -2565,6 +2565,9 @@ struct wiphy_wowlan_support {
+@@ -2577,6 +2577,9 @@ struct wiphy_wowlan_support {
  struct wiphy {
  	/* assign these fields before you register the wiphy */
  
patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_iwlegacy_4965-mac.patch +1 -1
index 9073d05..79805b0 100644
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/iwlegacy/4965-mac.c
 +++ b/drivers/net/wireless/iwlegacy/4965-mac.c
-@@ -6803,7 +6803,12 @@ static struct pci_driver il4965_driver =
+@@ -6801,7 +6801,12 @@ static struct pci_driver il4965_driver =
  	.id_table = il4965_hw_card_ids,
  	.probe = il4965_pci_probe,
  	.remove = il4965_pci_remove,
patches/collateral-evolutions/network/12-mac80211-disable-tx-status/net_mac80211_tx.patch +2 -2
index 5e92069..11533d7 100644
@@ -1,6 +1,6 @@
 --- a/net/mac80211/tx.c
 +++ b/net/mac80211/tx.c
-@@ -2035,6 +2035,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s
+@@ -1977,6 +1977,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s
  		goto fail_rcu;
  	}
  
@@ -8,7 +8,7 @@
  	if (unlikely(!multicast && skb->sk &&
  		     skb_shinfo(skb)->tx_flags & SKBTX_WIFI_STATUS)) {
  		struct sk_buff *orig_skb = skb;
-@@ -2063,6 +2064,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s
+@@ -2005,6 +2006,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s
  			skb = orig_skb;
  		}
  	}
patches/collateral-evolutions/network/17-netdev-queue/net_mac80211_iface.patch +2 -2
index c38ea75..7a4404d 100644
@@ -1,6 +1,6 @@
 --- a/net/mac80211/iface.c
 +++ b/net/mac80211/iface.c
-@@ -1689,6 +1689,7 @@ void ieee80211_sdata_stop(struct ieee802
+@@ -1690,6 +1690,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;
-@@ -1716,6 +1717,22 @@ void ieee80211_remove_interfaces(struct
+@@ -1717,6 +1718,22 @@ void ieee80211_remove_interfaces(struct
  		kfree(sdata);
  	}
  }
patches/collateral-evolutions/network/22-multiqueue/net_mac80211_tx.patch +1 -1
index a1f32e1..01102c2 100644
@@ -1,6 +1,6 @@
 --- a/net/mac80211/tx.c
 +++ b/net/mac80211/tx.c
-@@ -1512,6 +1512,10 @@ void ieee80211_xmit(struct ieee80211_sub
+@@ -1454,6 +1454,10 @@ void ieee80211_xmit(struct ieee80211_sub
  		}
  	}
  
patches/collateral-evolutions/network/25-multicast-list_head/drivers_net_wireless_mwl8k.patch +5 -5
index 6f36d72..c1d11c3 100644
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/mwl8k.c
 +++ b/drivers/net/wireless/mwl8k.c
-@@ -2656,15 +2656,21 @@ struct mwl8k_cmd_mac_multicast_adr {
+@@ -2654,15 +2654,21 @@ struct mwl8k_cmd_mac_multicast_adr {
  
  static struct mwl8k_cmd_pkt *
  __mwl8k_cmd_mac_multicast_adr(struct ieee80211_hw *hw, int allmulti,
@@ -22,7 +22,7 @@
  
  	if (allmulti || mc_count > priv->num_mcaddrs) {
  		allmulti = 1;
-@@ -2685,13 +2691,27 @@ __mwl8k_cmd_mac_multicast_adr(struct iee
+@@ -2683,13 +2689,27 @@ __mwl8k_cmd_mac_multicast_adr(struct iee
  	if (allmulti) {
  		cmd->action |= cpu_to_le16(MWL8K_ENABLE_RX_ALL_MULTICAST);
  	} else if (mc_count) {
@@ -50,7 +50,7 @@
  		}
  	}
  
-@@ -5026,7 +5046,11 @@ mwl8k_bss_info_changed(struct ieee80211_
+@@ -5024,7 +5044,11 @@ mwl8k_bss_info_changed(struct ieee80211_
  }
  
  static u64 mwl8k_prepare_multicast(struct ieee80211_hw *hw,
@@ -62,7 +62,7 @@
  {
  	struct mwl8k_cmd_pkt *cmd;
  
-@@ -5037,7 +5061,11 @@ static u64 mwl8k_prepare_multicast(struc
+@@ -5035,7 +5059,11 @@ static u64 mwl8k_prepare_multicast(struc
  	 * we'll end up throwing this packet away and creating a new
  	 * one in mwl8k_configure_filter().
  	 */
@@ -74,7 +74,7 @@
  
  	return (unsigned long)cmd;
  }
-@@ -5159,7 +5187,11 @@ static void mwl8k_configure_filter(struc
+@@ -5157,7 +5185,11 @@ static void mwl8k_configure_filter(struc
  	 */
  	if (*total_flags & FIF_ALLMULTI) {
  		kfree(cmd);
patches/collateral-evolutions/network/25-multicast-list_head/include_net_mac80211.patch +1 -1
index e2393b4..84337c7 100644
@@ -1,6 +1,6 @@
 --- a/include/net/mac80211.h
 +++ b/include/net/mac80211.h
-@@ -2612,14 +2612,24 @@ struct ieee80211_ops {
+@@ -2647,14 +2647,24 @@ struct ieee80211_ops {
  	void (*stop_ap)(struct ieee80211_hw *hw, struct ieee80211_vif *vif);
  
  	u64 (*prepare_multicast)(struct ieee80211_hw *hw,
patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_ieee80211_i.patch +1 -1
index 629007d..b21841d 100644
@@ -1,6 +1,6 @@
 --- a/net/mac80211/ieee80211_i.h
 +++ b/net/mac80211/ieee80211_i.h
-@@ -907,7 +907,12 @@ struct ieee80211_local {
+@@ -910,7 +910,12 @@ struct ieee80211_local {
  	struct work_struct reconfig_filter;
  
  	/* aggregated multicast list */
patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_iface.patch +1 -1
index e08b4d0..895287e 100644
@@ -14,7 +14,7 @@
  		spin_unlock_bh(&local->filter_lock);
  		netif_addr_unlock_bh(sdata->dev);
  	}
-@@ -978,10 +983,20 @@ static void ieee80211_set_multicast_list
+@@ -979,10 +984,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)
patches/collateral-evolutions/network/30-bridge-port/net_wireless_nl80211.patch +1 -1
index 6570273..434b59c 100644
@@ -1,6 +1,6 @@
 --- a/net/wireless/nl80211.c
 +++ b/net/wireless/nl80211.c
-@@ -2298,7 +2298,7 @@ static int nl80211_valid_4addr(struct cf
+@@ -2309,7 +2309,7 @@ static int nl80211_valid_4addr(struct cf
  			       enum nl80211_iftype iftype)
  {
  	if (!use_4addr) {
patches/collateral-evolutions/network/36-workqueue/net_mac80211_main.patch +1 -1
index 04e1cac..d8759fe 100644
@@ -1,6 +1,6 @@
 --- a/net/mac80211/main.c
 +++ b/net/mac80211/main.c
-@@ -1151,6 +1151,10 @@ static void __exit ieee80211_exit(void)
+@@ -1152,6 +1152,10 @@ static void __exit ieee80211_exit(void)
  	rc80211_minstrel_ht_exit();
  	rc80211_minstrel_exit();
  
patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atlx_atl1.patch +1 -1
index 47dc6ae..e8e6108 100644
@@ -11,7 +11,7 @@
  	.ndo_do_ioctl		= atlx_ioctl,
  	.ndo_tx_timeout		= atlx_tx_timeout,
  #ifdef CONFIG_NET_POLL_CONTROLLER
-@@ -3020,11 +3025,13 @@ static int atl1_probe(struct pci_dev *pd
+@@ -3023,11 +3025,13 @@ static int atl1_probe(struct pci_dev *pd
  	netdev->features |= NETIF_F_SG;
  	netdev->features |= (NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX);
  
patches/collateral-evolutions/network/42-netlink_seq/net_wireless_nl80211.patch +1 -1
index be71278..5da8151 100644
@@ -1,6 +1,6 @@
 --- a/net/wireless/nl80211.c
 +++ b/net/wireless/nl80211.c
-@@ -5669,7 +5669,9 @@ static int nl80211_dump_scan(struct sk_b
+@@ -5685,7 +5685,9 @@ static int nl80211_dump_scan(struct sk_b
  	spin_lock_bh(&rdev->bss_lock);
  	cfg80211_bss_expire(rdev);
  
patches/collateral-evolutions/network/62-usb_driver_lpm/drivers_net_wireless_rt2x00_rt2500usb.patch +1 -1
index f2a644e..af9ee0b 100644
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/rt2x00/rt2500usb.c
 +++ b/drivers/net/wireless/rt2x00/rt2500usb.c
-@@ -1989,7 +1989,9 @@ static struct usb_driver rt2500usb_drive
+@@ -1990,7 +1990,9 @@ static struct usb_driver rt2500usb_drive
  	.suspend	= rt2x00usb_suspend,
  	.resume		= rt2x00usb_resume,
  	.reset_resume	= rt2x00usb_resume,
patches/collateral-evolutions/network/69-wowlan-no-socket/net_wireless_nl80211.patch +1 -1
index 2a6c740..608f2a2 100644
@@ -1,6 +1,6 @@
 --- a/net/wireless/nl80211.c
 +++ b/net/wireless/nl80211.c
-@@ -7726,7 +7726,7 @@ static int nl80211_parse_wowlan_tcp(stru
+@@ -7746,7 +7746,7 @@ static int nl80211_parse_wowlan_tcp(stru
  		port = nla_get_u16(tb[NL80211_WOWLAN_TCP_SRC_PORT]);
  	else
  		port = 0;
Signature · 1 line
1.7.10.4
#8 lore raw
In reply to Luis R. Rodriguez
Quoted 4 lines · Luis R. Rodriguez

From: "Luis R. Rodriguez" <[email protected]>

I've addressed backporting rfkill here in a way that I think is more suitable. Let me know what you think.

I've replaced the rfkill with my patch, and added the vb2_mmap_pfn_range() patch that I had that was causing me trouble. Then I applied your patches 2-5.

johannes