From 1c8528115a28339c5e0e173b4aeb35f470c6f22f Mon Sep 17 00:00:00 2001 From: John Dykstra Date: Thu, 11 Jun 2009 20:57:21 -0700 Subject: [PATCH] --- yaml --- r: 150926 b: refs/heads/master c: 746e6ad23cd6fec2edce056e014a0eabeffa838c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/Documentation/networking/operstates.txt | 3 --- trunk/net/core/dev.c | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index f83542ae0b3e..a86e40d805fd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8981f01001c616f58f1623ecadfab8b1ed758da7 +refs/heads/master: 746e6ad23cd6fec2edce056e014a0eabeffa838c diff --git a/trunk/Documentation/networking/operstates.txt b/trunk/Documentation/networking/operstates.txt index c9074f9b78bb..1a77a3cfae54 100644 --- a/trunk/Documentation/networking/operstates.txt +++ b/trunk/Documentation/networking/operstates.txt @@ -38,9 +38,6 @@ ifinfomsg::if_flags & IFF_LOWER_UP: ifinfomsg::if_flags & IFF_DORMANT: Driver has signaled netif_dormant_on() -These interface flags can also be queried without netlink using the -SIOCGIFFLAGS ioctl. - TLV IFLA_OPERSTATE contains RFC2863 state of the interface in numeric representation: diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c index 11560e3258b5..a09bf658970f 100644 --- a/trunk/net/core/dev.c +++ b/trunk/net/core/dev.c @@ -4209,7 +4209,7 @@ static int dev_ifsioc_locked(struct net *net, struct ifreq *ifr, unsigned int cm switch (cmd) { case SIOCGIFFLAGS: /* Get interface flags */ - ifr->ifr_flags = dev_get_flags(dev); + ifr->ifr_flags = (short) dev_get_flags(dev); return 0; case SIOCGIFMETRIC: /* Get the metric on the interface