Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[firefly-linux-kernel-4.4.55.git] / net / caif / caif_dev.c

diff --git a/net/caif/caif_dev.c b/net/caif/caif_dev.c
index 21760f0089749217e03790e02b49998fc5a7958c..df6d56d8689ab93fec66f1e9284fda48ebca331c 100644 (file)
--- a/net/caif/caif_dev.c
+++ b/net/caif/caif_dev.c
@@ -301,10 +301,11 @@ static void dev_flowctrl(struct net_device *dev, int on)
 }
 
 void caif_enroll_dev(struct net_device *dev, struct caif_dev_common *caifdev,
-                       struct cflayer *link_support, int head_room,
-                       struct cflayer **layer, int (**rcv_func)(
-                               struct sk_buff *, struct net_device *,
-                               struct packet_type *, struct net_device *))
+                    struct cflayer *link_support, int head_room,
+                    struct cflayer **layer,
+                    int (**rcv_func)(struct sk_buff *, struct net_device *,
+                                     struct packet_type *,
+                                     struct net_device *))
 {
        struct caif_device_entry *caifd;
        enum cfcnfg_phy_preference pref;