openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

net: net_device flags is an unsigned int 

commit b00055aacd ([NET] core: add RFC2863 operstate) changed
net_device flags from unsigned short to unsigned int.

Some core functions still assume its an unsigned short.

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric Dumazet 2011-11-30 21:42:26 +00:00 committed by David S. Miller
parent ea1f51beff
commit b536db9332
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
net/core/dev.c
View File

@ -4459,7 +4459,7 @@ static void dev_change_rx_flags(struct net_device *dev, int flags)
static int __dev_set_promiscuity(struct net_device *dev, int inc) static int __dev_set_promiscuity(struct net_device *dev, int inc)
{ {
unsigned short old_flags = dev->flags; unsigned int old_flags = dev->flags;
uid_t uid; uid_t uid;
gid_t gid; gid_t gid;
@ -4516,7 +4516,7 @@ static int __dev_set_promiscuity(struct net_device *dev, int inc)
*/ */
int dev_set_promiscuity(struct net_device *dev, int inc) int dev_set_promiscuity(struct net_device *dev, int inc)
{ {
unsigned short old_flags = dev->flags; unsigned int old_flags = dev->flags;
int err; int err;
err = __dev_set_promiscuity(dev, inc); err = __dev_set_promiscuity(dev, inc);
@ -4543,7 +4543,7 @@ EXPORT_SYMBOL(dev_set_promiscuity);
int dev_set_allmulti(struct net_device *dev, int inc) int dev_set_allmulti(struct net_device *dev, int inc)
{ {
unsigned short old_flags = dev->flags; unsigned int old_flags = dev->flags;
ASSERT_RTNL(); ASSERT_RTNL();
@ -4646,7 +4646,7 @@ EXPORT_SYMBOL(dev_get_flags);
int __dev_change_flags(struct net_device *dev, unsigned int flags) int __dev_change_flags(struct net_device *dev, unsigned int flags)
{ {
int old_flags = dev->flags; unsigned int old_flags = dev->flags;
int ret; int ret;
ASSERT_RTNL(); ASSERT_RTNL();
@ -4729,10 +4729,10 @@ void __dev_notify_flags(struct net_device *dev, unsigned int old_flags)
* Change settings on device based state flags. The flags are * Change settings on device based state flags. The flags are
* in the userspace exported format. * in the userspace exported format.
*/ */
int dev_change_flags(struct net_device *dev, unsigned flags) int dev_change_flags(struct net_device *dev, unsigned int flags)
{ {
int ret, changes; int ret;
int old_flags = dev->flags; unsigned int changes, old_flags = dev->flags;
ret = __dev_change_flags(dev, flags); ret = __dev_change_flags(dev, flags);
if (ret < 0) if (ret < 0)