From 34ad129cbe3263332d7c25d3650418a7c72dbeae Mon Sep 17 00:00:00 2001 From: Rudy Matela Date: Sun, 29 Nov 2009 23:42:42 -0800 Subject: [PATCH] --- yaml --- r: 172031 b: refs/heads/master c: 6f7ad1e3a24a64923538557b686d24c37b26f9d8 h: refs/heads/master i: 172029: fa3f8fcd3ce8efd99988a359fc9a3ac78becf5c4 172027: add2d4e95a181a61178acdbb485d8a65ac069ff9 172023: 3bf479a5af6c29cae5d7456aa7fd7cf58deffb9f 172015: 1ff1eb9e9795a0cb7e831bd8566b586ff3501d52 171999: f52599b6dcb76c6345cbf7fcea0c652176aeb44c 171967: b4f98e918f6d332b62105a419adc8f487592bbe1 171903: d0f4cdb8ed0a7ebf0ebad40521ecd0c632b3be50 171775: 087aa606f8f6af1430371d602652c5df6ff4ec8d 171519: bfc86208a1f22038333901cb41c9045b7402e14a 171007: 305b2860826f0469155f3a104af3ace31676c9ca 169983: e3df3fc003619bb1dd302bc11a3f6d1e7a989efa 167935: ae7cd49d750547632377570b6e14c79bc9d09918 163839: 820908f85d8f79136026e16e4e366ec7895ebcf6 v: v3 --- [refs] | 2 +- trunk/drivers/net/wan/hdlc_fr.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 1b4e5a80899d..86f5a4783346 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 48b3d3efbd200ede1a4170bbcd81c062306a1907 +refs/heads/master: 6f7ad1e3a24a64923538557b686d24c37b26f9d8 diff --git a/trunk/drivers/net/wan/hdlc_fr.c b/trunk/drivers/net/wan/hdlc_fr.c index 840cff72a0f1..a7d4fc1a03a2 100644 --- a/trunk/drivers/net/wan/hdlc_fr.c +++ b/trunk/drivers/net/wan/hdlc_fr.c @@ -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)) @@ -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,