Patch "net: vlan,ethtool: netdev_features_t is more than 32 bit" has been added to the 3.4-stable tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



This is a note to let you know that I've just added the patch titled

    net: vlan,ethtool: netdev_features_t is more than 32 bit

to the 3.4-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     net-vlan-ethtool-netdev_features_t-is-more-than-32-bit.patch
and it can be found in the queue-3.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.


>From 122a6b09205e350cdc6adb28ea12ae05313dcc11 Mon Sep 17 00:00:00 2001
From: Bjørn Mork <bjorn@xxxxxxx>
Date: Wed, 1 May 2013 23:06:42 +0000
Subject: net: vlan,ethtool: netdev_features_t is more than 32 bit


From: Bjørn Mork <bjorn@xxxxxxx>

[ Upstream commit b29d3145183da4e07d4b570fa8acdd3ac4a5c572 ]

Signed-off-by: Bjørn Mork <bjorn@xxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
 net/8021q/vlan_dev.c |    2 +-
 net/core/ethtool.c   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- a/net/8021q/vlan_dev.c
+++ b/net/8021q/vlan_dev.c
@@ -598,7 +598,7 @@ static netdev_features_t vlan_dev_fix_fe
 	netdev_features_t features)
 {
 	struct net_device *real_dev = vlan_dev_priv(dev)->real_dev;
-	u32 old_features = features;
+	netdev_features_t old_features = features;
 
 	features &= real_dev->vlan_features;
 	features |= NETIF_F_RXCSUM;
--- a/net/core/ethtool.c
+++ b/net/core/ethtool.c
@@ -1286,7 +1286,7 @@ int dev_ethtool(struct net *net, struct
 	void __user *useraddr = ifr->ifr_data;
 	u32 ethcmd;
 	int rc;
-	u32 old_features;
+	netdev_features_t old_features;
 
 	if (!dev || !netif_device_present(dev))
 		return -ENODEV;


Patches currently in stable-queue which might be from bjorn@xxxxxxx are

queue-3.4/net-vlan-ethtool-netdev_features_t-is-more-than-32-bit.patch
queue-3.4/net-qmi_wwan-fixup-missing-ethernet-header-firmware-bug-workaround.patch
queue-3.4/net-qmi_wwan-fixup-destination-address-firmware-bug-workaround.patch
queue-3.4/net-qmi_wwan-prevent-duplicate-mac-address-on-link-firmware-bug-workaround.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux Kernel]     [Kernel Development Newbies]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite Hiking]     [Linux Kernel]     [Linux SCSI]