From 61872cc792142170f6bc283f6f63853e6b0cdd9d Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Wed, 30 Nov 2011 21:42:26 +0000 Subject: [PATCH] --- yaml --- r: 278313 b: refs/heads/master c: b536db9332cf90c4f44ca809f028645205fa89ad h: refs/heads/master i: 278311: c046171ae8d7a2534e93295f91f71e0318ff9767 v: v3 --- [refs] | 2 +- trunk/net/core/dev.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 0f1700658d33..b1f23b995915 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ea1f51beff4ddd0234c59a125290aeb355cf62b2 +refs/heads/master: b536db9332cf90c4f44ca809f028645205fa89ad diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c index 278463e91e3a..e0c3deec59b0 100644 --- a/trunk/net/core/dev.c +++ b/trunk/net/core/dev.c @@ -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) { - unsigned short old_flags = dev->flags; + unsigned int old_flags = dev->flags; uid_t uid; 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) { - unsigned short old_flags = dev->flags; + unsigned int old_flags = dev->flags; int err; 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) { - unsigned short old_flags = dev->flags; + unsigned int old_flags = dev->flags; ASSERT_RTNL(); @@ -4646,7 +4646,7 @@ EXPORT_SYMBOL(dev_get_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; 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 * 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 old_flags = dev->flags; + int ret; + unsigned int changes, old_flags = dev->flags; ret = __dev_change_flags(dev, flags); if (ret < 0)