diff options
| author | Michał Mirosław <mirq-linux@rere.qmqm.pl> | 2011-01-25 00:32:47 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-25 00:32:47 +0100 |
| commit | 04ed3e741d0f133e02bed7fa5c98edba128f90e7 (patch) | |
| tree | 3dde4ca8306e98536faa69bccf0e47a2549c088f /net/8021q/vlan.c | |
| parent | net: Move check of checksum features to netdev_fix_features() (diff) | |
| download | linux-04ed3e741d0f133e02bed7fa5c98edba128f90e7.tar.xz linux-04ed3e741d0f133e02bed7fa5c98edba128f90e7.zip | |
net: change netdev->features to u32
Quoting Ben Hutchings: we presumably won't be defining features that
can only be enabled on 64-bit architectures.
Occurences found by `grep -r` on net/, drivers/net, include/
[ Move features and vlan_features next to each other in
struct netdev, as per Eric Dumazet's suggestion -DaveM ]
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/8021q/vlan.c')
| -rw-r--r-- | net/8021q/vlan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c index 6e64f7c6a2e9..7850412f52b7 100644 --- a/net/8021q/vlan.c +++ b/net/8021q/vlan.c @@ -327,7 +327,7 @@ static void vlan_sync_address(struct net_device *dev, static void vlan_transfer_features(struct net_device *dev, struct net_device *vlandev) { - unsigned long old_features = vlandev->features; + u32 old_features = vlandev->features; vlandev->features &= ~dev->vlan_features; vlandev->features |= dev->features & dev->vlan_features; |