aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wan
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wan')
-rw-r--r--drivers/net/wan/hdlc_fr.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wan/hdlc_fr.c b/drivers/net/wan/hdlc_fr.c
index 840cff72a0f1..a7d4fc1a03a2 100644
--- a/drivers/net/wan/hdlc_fr.c
+++ b/drivers/net/wan/hdlc_fr.c
@@ -1214,10 +1214,10 @@ static int fr_ioctl(struct net_device *dev, struct ifreq *ifr)
1214 return 0; 1214 return 0;
1215 1215
1216 case IF_PROTO_FR: 1216 case IF_PROTO_FR:
1217 if(!capable(CAP_NET_ADMIN)) 1217 if (!capable(CAP_NET_ADMIN))
1218 return -EPERM; 1218 return -EPERM;
1219 1219
1220 if(dev->flags & IFF_UP) 1220 if (dev->flags & IFF_UP)
1221 return -EBUSY; 1221 return -EBUSY;
1222 1222
1223 if (copy_from_user(&new_settings, fr_s, size)) 1223 if (copy_from_user(&new_settings, fr_s, size))
@@ -1263,7 +1263,7 @@ static int fr_ioctl(struct net_device *dev, struct ifreq *ifr)
1263 if (dev_to_hdlc(dev)->proto != &proto) /* Different proto */ 1263 if (dev_to_hdlc(dev)->proto != &proto) /* Different proto */
1264 return -EINVAL; 1264 return -EINVAL;
1265 1265
1266 if(!capable(CAP_NET_ADMIN)) 1266 if (!capable(CAP_NET_ADMIN))
1267 return -EPERM; 1267 return -EPERM;
1268 1268
1269 if (copy_from_user(&pvc, ifr->ifr_settings.ifs_ifsu.fr_pvc, 1269 if (copy_from_user(&pvc, ifr->ifr_settings.ifs_ifsu.fr_pvc,