Skip to content

Commit

Permalink
net: net_device flags is an unsigned int
Browse files Browse the repository at this point in the history
commit b00055a ([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>
  • Loading branch information
Eric Dumazet authored and David S. Miller committed Dec 1, 2011
1 parent ea1f51b commit b536db9
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions net/core/dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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);
Expand All @@ -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();

Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit b536db9

Please sign in to comment.