diff --git a/[refs] b/[refs] index 90977fbf6a0b..d2e5c4a8dc8c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d4f73c8e459d355e10051174d859ffd0ef5764c0 +refs/heads/master: f946dffed6334f08da065a89ed65026ebf8b33b4 diff --git a/trunk/drivers/net/tehuti.c b/trunk/drivers/net/tehuti.c index d2e1b219673d..e83b166aa6b9 100644 --- a/trunk/drivers/net/tehuti.c +++ b/trunk/drivers/net/tehuti.c @@ -649,6 +649,9 @@ static int bdx_ioctl_priv(struct net_device *ndev, struct ifreq *ifr, int cmd) DBG("%d 0x%x 0x%x\n", data[0], data[1], data[2]); } + if (!capable(CAP_NET_ADMIN)) + return -EPERM; + switch (data[0]) { case BDX_OP_READ: @@ -664,8 +667,6 @@ static int bdx_ioctl_priv(struct net_device *ndev, struct ifreq *ifr, int cmd) break; case BDX_OP_WRITE: - if (!capable(CAP_NET_ADMIN)) - return -EPERM; error = bdx_range_check(priv, data[1]); if (error < 0) return error;