diff options
author | Stephen Hemminger <shemminger@osdl.org> | 2005-05-29 17:14:35 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2005-05-29 17:14:35 -0400 |
commit | 81e8157583c559c27aac75c708d40a35f563d734 (patch) | |
tree | 3172c6de15e6a8ea07373a23e901ee0e4366c4f1 | |
parent | d8a33ac435c43a1a404b2ec560ef1d1536710c36 (diff) |
[BRIDGE]: make dev->features unsigned
The features field in netdevice is really a bitmask, and bitmask's should
be unsigned.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | include/linux/netdevice.h | 2 | ||||
-rw-r--r-- | net/core/ethtool.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index d8c65ecef9d9..470af8c1a4a0 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
@@ -401,7 +401,7 @@ struct net_device | |||
401 | } reg_state; | 401 | } reg_state; |
402 | 402 | ||
403 | /* Net device features */ | 403 | /* Net device features */ |
404 | int features; | 404 | unsigned long features; |
405 | #define NETIF_F_SG 1 /* Scatter/gather IO. */ | 405 | #define NETIF_F_SG 1 /* Scatter/gather IO. */ |
406 | #define NETIF_F_IP_CSUM 2 /* Can checksum only TCP/UDP over IPv4. */ | 406 | #define NETIF_F_IP_CSUM 2 /* Can checksum only TCP/UDP over IPv4. */ |
407 | #define NETIF_F_NO_CSUM 4 /* Does not require checksum. F.e. loopack. */ | 407 | #define NETIF_F_NO_CSUM 4 /* Does not require checksum. F.e. loopack. */ |
diff --git a/net/core/ethtool.c b/net/core/ethtool.c index 252bfc6f03f4..2a56a5218363 100644 --- a/net/core/ethtool.c +++ b/net/core/ethtool.c | |||
@@ -682,7 +682,7 @@ int dev_ethtool(struct ifreq *ifr) | |||
682 | void __user *useraddr = ifr->ifr_data; | 682 | void __user *useraddr = ifr->ifr_data; |
683 | u32 ethcmd; | 683 | u32 ethcmd; |
684 | int rc; | 684 | int rc; |
685 | int old_features; | 685 | unsigned long old_features; |
686 | 686 | ||
687 | /* | 687 | /* |
688 | * XXX: This can be pushed down into the ethtool_* handlers that | 688 | * XXX: This can be pushed down into the ethtool_* handlers that |