diff options
| author | Stephen Hemminger <shemminger@osdl.org> | 2005-05-29 14:14:35 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2005-05-29 14:14:35 -0700 |
| commit | 81e8157583c559c27aac75c708d40a35f563d734 (patch) | |
| tree | 3172c6de15e6a8ea07373a23e901ee0e4366c4f1 | |
| parent | d8a33ac435c43a1a404b2ec560ef1d1536710c36 (diff) | |
| download | linux-3.10-81e8157583c559c27aac75c708d40a35f563d734.tar.gz linux-3.10-81e8157583c559c27aac75c708d40a35f563d734.tar.bz2 linux-3.10-81e8157583c559c27aac75c708d40a35f563d734.zip | |
[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 d8c65ecef9d..470af8c1a4a 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -401,7 +401,7 @@ struct net_device } reg_state; /* Net device features */ - int features; + unsigned long features; #define NETIF_F_SG 1 /* Scatter/gather IO. */ #define NETIF_F_IP_CSUM 2 /* Can checksum only TCP/UDP over IPv4. */ #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 252bfc6f03f..2a56a521836 100644 --- a/net/core/ethtool.c +++ b/net/core/ethtool.c @@ -682,7 +682,7 @@ int dev_ethtool(struct ifreq *ifr) void __user *useraddr = ifr->ifr_data; u32 ethcmd; int rc; - int old_features; + unsigned long old_features; /* * XXX: This can be pushed down into the ethtool_* handlers that |