diff --git a/[refs] b/[refs] index baf51ae08e59..de560cd3e7e5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d3d317092b58a6df1d31a4ca90cdb9d2bd4ebffa +refs/heads/master: 5f2f6da76c429c42d54f73807f00b8fd761a7d68 diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c index 048cf1197872..daca72e6b37b 100644 --- a/trunk/net/core/dev.c +++ b/trunk/net/core/dev.c @@ -3745,11 +3745,13 @@ static int dev_ifsioc(struct net *net, struct ifreq *ifr, unsigned int cmd) { int err; struct net_device *dev = __dev_get_by_name(net, ifr->ifr_name); - const struct net_device_ops *ops = dev->netdev_ops; + const struct net_device_ops *ops; if (!dev) return -ENODEV; + ops = dev->netdev_ops; + switch (cmd) { case SIOCSIFFLAGS: /* Set interface flags */ return dev_change_flags(dev, ifr->ifr_flags);