Merge branch 'master' into staging-next

[karo-tx-linux.git] / net / bridge / br_ioctl.c

diff --git a/net/bridge/br_ioctl.c b/net/bridge/br_ioctl.c
index cd8c3a44ab7dccbdb82ddb0cba3fe0a8c2e978c0..a9a4a1b7863d11c1972c13ba0767c0ccdcfcfe35 100644 (file)
--- a/net/bridge/br_ioctl.c
+++ b/net/bridge/br_ioctl.c
@@ -381,7 +381,7 @@ int br_dev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 {
        struct net_bridge *br = netdev_priv(dev);
 
-       switch(cmd) {
+       switch (cmd) {
        case SIOCDEVPRIVATE:
                return old_dev_ioctl(dev, rq, cmd);