Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 172031
b: refs/heads/master
c: 6f7ad1e
h: refs/heads/master
i:
  172029: fa3f8fc
  172027: add2d4e
  172023: 3bf479a
  172015: 1ff1eb9
  171999: f52599b
  171967: b4f98e9
  171903: d0f4cdb
  171775: 087aa60
  171519: bfc8620
  171007: 305b286
  169983: e3df3fc
  167935: ae7cd49
  163839: 820908f
v: v3
  • Loading branch information
Rudy Matela authored and David S. Miller committed Nov 30, 2009
1 parent 30bfccf commit 34ad129
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 48b3d3efbd200ede1a4170bbcd81c062306a1907
refs/heads/master: 6f7ad1e3a24a64923538557b686d24c37b26f9d8
6 changes: 3 additions & 3 deletions trunk/drivers/net/wan/hdlc_fr.c
Original file line number Diff line number Diff line change
Expand Up @@ -1214,10 +1214,10 @@ static int fr_ioctl(struct net_device *dev, struct ifreq *ifr)
return 0;

case IF_PROTO_FR:
if(!capable(CAP_NET_ADMIN))
if (!capable(CAP_NET_ADMIN))
return -EPERM;

if(dev->flags & IFF_UP)
if (dev->flags & IFF_UP)
return -EBUSY;

if (copy_from_user(&new_settings, fr_s, size))
Expand Down Expand Up @@ -1263,7 +1263,7 @@ static int fr_ioctl(struct net_device *dev, struct ifreq *ifr)
if (dev_to_hdlc(dev)->proto != &proto) /* Different proto */
return -EINVAL;

if(!capable(CAP_NET_ADMIN))
if (!capable(CAP_NET_ADMIN))
return -EPERM;

if (copy_from_user(&pvc, ifr->ifr_settings.ifs_ifsu.fr_pvc,
Expand Down

0 comments on commit 34ad129

Please sign in to comment.